kikito 8ca546a431 merges master and fixes conflicts

2015-08-17 02:40:11 +02:00

..

base_controller.rb

Adds back missing authenticate_user! calls

2015-08-10 16:05:58 +02:00

dashboard_controller.rb

adds admin layout and access links [#163]

2015-08-14 12:37:44 +02:00

organizations_controller.rb

Updates the Moderation Organisation controller

2015-08-13 20:05:32 +02:00