osem-fcy/app
Stella Rouzi 17ebad413e base controller
Conflicts:
	app/controllers/admin/commercials_controller.rb
	app/controllers/admin/questions_controller.rb
	app/controllers/admin/users_controller.rb
2014-08-14 11:36:07 +03:00
..
assets changes from comments, fix commercials failing test 2014-08-13 22:53:15 +03:00
controllers base controller 2014-08-14 11:36:07 +03:00
helpers changes from comments, fix commercials failing test 2014-08-13 22:53:15 +03:00
mailers Subscription on Registration, Independent Subscription without registration 2014-08-12 16:47:36 +05:30
models fixes 2014-08-13 22:53:14 +03:00
serializers Move Conference contact details to Contact 2014-08-01 14:30:10 +02:00
views changes from comments, fix commercials failing test 2014-08-13 22:53:15 +03:00