Alexander Machehin fcffff4178 Merge branch 'master' into 90-pull ... Conflicts: app/assets/stylesheets/design/custom.scss config/locales/title.en.yml config/locales/title.ru.yml config/routes.rb db/schema.rb		2012-05-17 22:58:29 +06:00
..
images	[refs #443] add pirobox popup	2012-05-12 19:17:07 +06:00
javascripts	Merge branch 'master' into 90-pull	2012-05-17 22:58:29 +06:00
stylesheets	Merge branch 'master' into 90-pull	2012-05-17 22:58:29 +06:00