Merge branch 'next' into feature/view-updates
authorPiotr Solnica <piotr.solnica@gmail.com>
Wed, 9 Oct 2013 18:01:43 +0000 (20:01 +0200)
committerPiotr Solnica <piotr.solnica@gmail.com>
Wed, 9 Oct 2013 18:01:43 +0000 (20:01 +0200)
commitd912faaf3a21ce7fde665ea075a5776de7f2937a
treed740bdb7fca7da1b5ee9c8a266f06e24806de06d
parent7eb1e6a424e7d5a3855916d390e29a8c3b805847
parent26dfe867f3c1384db0d62ffdeec6e991f93d15b5
Merge branch 'next' into feature/view-updates
Gemfile
Gemfile.lock
app/controllers/keys_controller.rb
test/test_helper.rb