Vladimir Sharshov 3cedef5f07 Merge branch 'master' into 344-fix_products_monitoring ... Conflicts: db/schema.rb		2012-03-30 20:30:06 +04:00
..
assets	[issue #195] Added legend for projects table. Added titles.	2012-03-30 18:51:57 +04:00
controllers	Merge branch 'master' into 344-fix_products_monitoring	2012-03-30 20:30:06 +04:00
helpers	Merge pull request #360 from warpc/195-new_design_for_projects	2012-03-30 09:20:22 -07:00
mailers	[refs #263] changed and fixed comment tests; some refactoring	2012-03-27 21:09:04 +06:00
models	Merge branch 'master' into 344-fix_products_monitoring	2012-03-30 20:30:06 +04:00
presenters	Merge branch '3.2-master' into 190-encodings	2012-03-22 00:13:18 +02:00
views	Merge branch 'master' into 344-fix_products_monitoring	2012-03-30 20:30:06 +04:00