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
..
images	[refs #325] Add new design to error pages	2012-03-22 11:16:56 +04:00
javascripts	[issue #195] Added groups support to project.	2012-03-22 04:44:05 +04:00
stylesheets	Merge branch '3.2-master' into 270-user_control	2012-03-22 21:15:10 +06:00