mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-12 08:25:19 +00:00
36393e1d2b
Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing. |
||
---|---|---|
.. | ||
_account.html.haml | ||
_action_log.html.haml | ||
_report.html.haml | ||
_status.html.haml | ||
index.html.haml | ||
show.html.haml |