Karina Kwiatek 391f4a28ed Merge branch 'master' into feature/announcements ... # Conflicts: # db/schema.rb		2020-04-19 21:52:58 +01:00
..
_header.html.haml	enable 'Discover' page for mods	2020-04-19 13:55:13 +02:00
_messages.html.haml	git localize flashes	2015-06-07 19:03:57 +02:00
_notifications.html.haml	make the notification center smaller and shorten content	2015-09-16 23:59:47 +02:00
_profile.html.haml	Use Rolify for admin and moderator roles	2020-04-19 22:35:58 +02:00
application.html.haml	Add announcements to the top of the application template	2020-04-19 21:38:21 +01:00
mail.html.haml	Fix emails	2015-07-23 12:12:36 +05:30
mail.text.erb	Fix text, add more templates	2015-07-21 23:50:54 +05:30