James Edwards-Jones b988faaf85 Merge branch 'master' into 'jej-pages-to-ce' ... # Conflicts: # db/schema.rb		2017-02-06 15:12:27 +00:00
..
_form.html.haml	Merge branch 'master' into 'jej-pages-to-ce'	2017-02-06 15:12:27 +00:00
show.html.haml	Put some admin settings in dropdown	2016-06-20 14:55:20 +03:00