2b9434f346
Conflicts: Gemfile Gemfile.lock app/assets/javascripts/angular-new/models/build_list.js.erb app/assets/javascripts/extra/build_list.js app/controllers/projects/build_lists_controller.rb app/controllers/projects/projects_controller.rb app/models/platform.rb app/views/projects/base/_layout.html.haml app/views/projects/build_lists/_new_form.html.haml app/views/projects/build_lists/show.html.haml app/views/projects/git/base/_fork.html.haml app/views/projects/git/commits/_commits.html.haml config/locales/en.yml config/locales/ru.yml |
||
---|---|---|
.. | ||
gollum | ||
chosen.scss | ||
codemirror_editor.scss | ||
cusel.scss | ||
jquery.dataTables.scss | ||
loading-bar.scss | ||
old-bootstrap.scss | ||
pirobox.scss | ||
pygments.scss | ||
tablesorter.scss | ||
timeline.scss | ||
vendor.scss |