Dmitriy Zaporozhets fe1433c379 Merge branch 'dev' ... Conflicts: app/helpers/dashboard_helper.rb		2011-11-09 20:29:59 +02:00
..
images	fixed conflicts	2011-11-06 21:12:23 +02:00
javascripts	Merge branch 'dev'	2011-11-09 20:29:59 +02:00
stylesheets	Merge branch 'dev'	2011-11-09 20:29:59 +02:00