Merge branch 'next' into feature/view-updates
authorPiotr Solnica <piotr.solnica@gmail.com>
Tue, 24 Sep 2013 11:36:37 +0000 (13:36 +0200)
committerPiotr Solnica <piotr.solnica@gmail.com>
Tue, 24 Sep 2013 11:36:37 +0000 (13:36 +0200)
commitf1cf8bcb75225779955ed90137bf2e4142129348
tree965284423c788617578ce893df5a77f751ea950e
parent7c14a900d13092870469444aaa1c3c787f63259d
parentb3dfccfedb83383e336fc74abc63834e65cb96e3
Merge branch 'next' into feature/view-updates

Conflicts:
Gemfile.lock
app/controllers/users_controller.rb
public/ui3
Gemfile
Gemfile.lock
app/controllers/application_controller.rb
app/controllers/users_controller.rb