Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
rosa-build/app/assets
History
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
..
images #435: added mock of logic 2014-10-08 00:16:48 +04:00
javascripts Merge branch 'master' into 369-bootstrap 2014-10-16 16:41:29 +06:00
stylesheets Merge branch 'master' into 369-bootstrap 2014-10-16 16:41:29 +06:00