741766a01d
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change. |
||
---|---|---|
.. | ||
_login.html.haml | ||
_registration.html.haml | ||
more.html.haml | ||
show.html.haml | ||
terms.html.haml |
741766a01d
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change. |
||
---|---|---|
.. | ||
_login.html.haml | ||
_registration.html.haml | ||
more.html.haml | ||
show.html.haml | ||
terms.html.haml |