-
mbajur authored
# Conflicts: # app/views/comments/show.html.slim # app/views/layouts/settings.html.slim # app/views/static/design.html.slim # config/locales/en.yml
63a4f5e0
# Conflicts: # app/views/comments/show.html.slim # app/views/layouts/settings.html.slim # app/views/static/design.html.slim # config/locales/en.yml