OSDN Git Service

Merge branch 'master' into 6-0-dev
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 8 Jul 2013 06:50:10 +0000 (09:50 +0300)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 8 Jul 2013 06:50:10 +0000 (09:50 +0300)
commit6ace422c298eef2c592d64c08f59b3da3d8d8a6d
tree9a1a43baeab7e73a4a97c9d4be18a2ddbe4f257c
parent2882d16e7a244d6627d9f6d9436651a38bf11bad
parent6f5f5e7ee32bbd693796571fa6fcb8575accc08a
Merge branch 'master' into 6-0-dev

Conflicts:
Gemfile
Gemfile.lock
Gemfile
Gemfile.lock
config/puma.rb.example
doc/install/installation.md