Merge branch 'next' into feature/view-updates
authorPiotr Solnica <piotr.solnica@gmail.com>
Thu, 26 Sep 2013 10:15:02 +0000 (12:15 +0200)
committerPiotr Solnica <piotr.solnica@gmail.com>
Thu, 26 Sep 2013 10:15:02 +0000 (12:15 +0200)
commitc448c5cb4b14e6cf77997b8a4c7f4f47544c2829
tree5bbc6dc5599b4b77cfe1b6bd60ae5c7d53e2b406
parent5f2c47d86a89766c436c42ba9ae378074adad92b
parentedc6b06c314ea67b156d5d1ae03bab663aafaad1
Merge branch 'next' into feature/view-updates

Conflicts:
app/use_cases/change_password.rb
app/use_cases/create_project.rb
Gemfile
Gemfile.lock
app/use_cases/change_password.rb
app/use_cases/create_project.rb