621affecb5
Conflicts: Gemfile.lock app/helpers/application_helper.rb app/views/devise/sessions/new.html.erb db/schema.rb |
||
---|---|---|
.. | ||
gitlab_bootstrap | ||
highlight | ||
sections | ||
themes | ||
application.css | ||
auth_methods.scss | ||
common.scss | ||
main.scss | ||
ref_select.scss |