Skip to content

Commit

Permalink
Merge branch 'master' of github.com:hapijs/hapi
Browse files Browse the repository at this point in the history
  • Loading branch information
hueniverse committed May 21, 2016
2 parents 86642f2 + 052a608 commit 54c6e44
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### Web and services application framework

<a href="https://sideway.com"><img src="http://blog.sideway.com/wp-content/uploads/logo-300x114.png" align="right" /></a>
<a href="https://sideway.com"><img src="https://www.sideway.com/sideway.png" align="right" /></a>

Lead Maintainer: [Eran Hammer](https://github.com/hueniverse)

Expand All @@ -13,7 +13,7 @@ authentication, and other essential facilities for building web and services app
developers to focus on writing reusable application logic in a highly modular and prescriptive approach.

Development version: **13.4.x** ([release notes](https://github.com/hapijs/hapi/issues?labels=release+notes&page=1&state=closed))
[![Build Status](https://secure.travis-ci.org/hapijs/hapi.svg)](http://travis-ci.org/hapijs/hapi)
[![Build Status](https://secure.travis-ci.org/hapijs/hapi.svg?branch=master)](http://travis-ci.org/hapijs/hapi)

For the latest updates, [change log](http://hapijs.com/updates), and release information visit [hapijs.com](http://hapijs.com) and follow [@hapijs](https://twitter.com/hapijs) on twitter. If you have questions, please open an issue in the
[discussion forum](https://github.com/hapijs/discuss).

0 comments on commit 54c6e44

Please sign in to comment.