Commit graph

3 commits

Author SHA1 Message Date
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
Stella Rouzi
f5081813d9 fix from rebase
Conflicts:
	app/views/layouts/_admin_sidebar.html.haml
2014-08-13 22:53:14 +03:00
Chrisbr
22cc5e4f14 Extracting Photos form Conference edit form
close #384
2014-08-12 08:38:51 +02:00