Alexander Machehin 071c391a6e Merge branch '3.2-master' into 270-user_control ... Conflicts: app/assets/stylesheets/design/custom.scss		2012-03-22 21:15:10 +06:00
..
assets	Merge branch '3.2-master' into 270-user_control	2012-03-22 21:15:10 +06:00
controllers	Merge branch '3.2-master' into 270-user_control	2012-03-22 21:15:10 +06:00
helpers	Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190	2012-03-21 21:55:14 +02:00
mailers	[refs #265] add project_id to comment & fix email notification	2012-03-07 03:49:29 +06:00
models	Merge branch '3.2-master' into 270-user_control	2012-03-22 21:15:10 +06:00
presenters	Merge branch '3.2-master' into 190-encodings	2012-03-22 00:13:18 +02:00
views	Merge branch '3.2-master' into 270-user_control	2012-03-22 21:15:10 +06:00