Alexander Machehin 2b9434f346 Merge branch 'master' into 369-bootstrap ... 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		2014-10-16 16:41:29 +06:00
..
audios	#267: added sound notifications	2013-08-20 23:10:24 +04:00
images	[issue #428] Changes in advisories.	2012-06-19 02:49:17 +04:00
javascripts	[#369] monitoring page; some fixes	2014-05-26 23:42:27 +06:00
stylesheets	Merge branch 'master' into 369-bootstrap	2014-10-16 16:41:29 +06:00