rosa-build/app
Pavel Chipiga 56a12dc9ea Merge branch 'master' into 3.2-master
Conflicts:
	app/models/comment.rb
	app/models/issue.rb
	config/locales/en.yml
2012-03-03 01:38:43 +02:00
..
assets [issue #195] Merge branch '3.2-master' into 195-new_design_for_projects 2012-03-02 20:58:28 +04:00
controllers Merge branch 'master' into 3.2-master 2012-03-03 01:38:43 +02:00
helpers Merge branch 'master' into 3.2-master 2012-03-03 01:38:43 +02:00
mailers Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174 2012-02-10 18:33:16 +02:00
models Merge branch 'master' into 3.2-master 2012-03-03 01:38:43 +02:00
presenters [issue #195] Fixed branch selector. 2012-03-02 20:48:19 +04:00
views Merge branch 'master' into 3.2-master 2012-03-03 01:38:43 +02:00