summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2016-08-15 10:31:08 +0000
committerazul <azul@riseup.net>2016-08-15 10:31:08 +0000
commit44910c0909f28791fe6725fa76301e5111ece3b4 (patch)
treeed4e8c83b6ff4536bb11eb9aef17bca1004eba27 /app/controllers/application_controller.rb
parentc14e6f65d7c991d00724873a4b6ab45b54a2e765 (diff)
parent3c6347de6b8dfa86fb4ae23bd07ae4b77db1742c (diff)
Merge branch 'upgrade/rails-4' into 'develop'
Upgrade/rails 4 See merge request !4
Diffstat (limited to 'app/controllers/application_controller.rb')
0 files changed, 0 insertions, 0 deletions