summaryrefslogtreecommitdiff
path: root/Rakefile
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-10-05 13:00:52 +0200
committerAzul <azul@leap.se>2012-10-05 13:00:52 +0200
commit6cf3dacd4a4d0f30a41c6a75658443ce6192e750 (patch)
tree2eaea784e97de9652ce8c39ab2b4db9e32de5d1e /Rakefile
parent5fe296eb9f9b216e05921ac0c41f5defc1cc2054 (diff)
parentc89610d1aad8500b4f7058c970bb07a60a55a5ce (diff)
Merge remote-tracking branch 'origin/master' into develop
Conflicts: users/app/controllers/sessions_controller.rb
Diffstat (limited to 'Rakefile')
0 files changed, 0 insertions, 0 deletions