Stella Rouzi f169049003 write in 1 single line actions with no body ... Conflicts: app/controllers/admin/contacts_controller.rb		2014-08-13 22:53:14 +03:00
..
assets	Refactoring Conference Basics #384	2014-08-12 08:32:45 +02:00
controllers	write in 1 single line actions with no body	2014-08-13 22:53:14 +03:00
helpers	Implement role authorization	2014-08-13 22:53:13 +03:00
mailers	Subscription on Registration, Independent Subscription without registration	2014-08-12 16:47:36 +05:30
models	fix from rebase	2014-08-13 22:53:14 +03:00
serializers	Move Conference contact details to Contact	2014-08-01 14:30:10 +02:00
views	fix in questions	2014-08-13 22:53:14 +03:00