rosa-build/app/views/platforms
Pavel Chipiga 644d57b420 Merge branch 'catalog'
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.haml
	app/views/repositories/show.html.haml
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
2011-10-21 17:55:41 +03:00
..
_form.html.haml Changed Platforms representation 2011-10-17 18:27:07 +04:00
_list.html.haml Changed Platforms representation 2011-10-17 18:27:07 +04:00
_sidebar.html.haml Fixed some bugs. 2011-10-20 21:01:01 +04:00
edit.html.haml Paul Irish BUY BUY oMG, Using AWESOME web-app-theme 2011-03-31 03:10:23 +04:00
index.html.haml Changed Platforms representation 2011-10-17 18:27:07 +04:00
new.html.haml Changed Platforms representation 2011-10-17 18:27:07 +04:00
show.html.haml Merge branch 'catalog' 2011-10-21 17:55:41 +03:00