osem-fcy/spec
Stella Rouzi f5081813d9 fix from rebase
Conflicts:
	app/views/layouts/_admin_sidebar.html.haml
2014-08-13 22:53:14 +03:00
..
controllers style fixes 2014-08-13 22:53:14 +03:00
factories fix conflicts 2014-08-13 22:53:13 +03:00
features fix from rebase 2014-08-13 22:53:14 +03:00
fixtures Extracting Photos form Conference edit form 2014-08-12 08:38:51 +02:00
models fix conflicts 2014-08-13 22:53:13 +03:00
support Implement role authorization 2014-08-13 22:53:13 +03:00
views Implement role authorization 2014-08-13 22:53:13 +03:00
spec_helper.rb Refactoring Conference/Event media to new media object 2014-08-06 14:30:50 +02:00