Commit graph

2 commits

Author SHA1 Message Date
Stella Rouzi
f5081813d9 fix from rebase
Conflicts:
	app/views/layouts/_admin_sidebar.html.haml
2014-08-13 22:53:14 +03:00
Chrisbr
a8b94c13f3 Refactoring Conference Basics #384 2014-08-12 08:32:45 +02:00