Stella Rouzi 71dfb3b7e4 fix conflicts		2014-08-13 22:53:13 +03:00
..
conferences_controller_spec.rb	fix conflicts	2014-08-13 22:53:13 +03:00
users_controller_spec.rb	Implement role authorization	2014-08-13 22:53:13 +03:00