diff options
author | Eugen <eugen@zeonfederated.com> | 2017-04-03 01:07:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-03 01:07:53 +0200 |
commit | d2358aefecb6858eab641752a3279cdaa824eaa3 (patch) | |
tree | c9393bbbe41a1c72bc2e40e924083c242f16588b /app/controllers/application_controller.rb | |
parent | c76d20c2a0572f1da7d2fafcd6c7a90aa6caf7f1 (diff) | |
parent | 30df1c8476739a7439762eb678962a5254918323 (diff) |
Merge branch 'master' into master
Diffstat (limited to 'app/controllers/application_controller.rb')
0 files changed, 0 insertions, 0 deletions