Dmitriy Zaporozhets e45e6ba2c3 Merge branch 'master' into sidebar-nav ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/layouts/group.html.haml		2014-12-21 01:20:51 +02:00
..
images	Improve login page behaviour	2014-07-13 20:56:29 +03:00
javascripts	Merge branch 'master' into sidebar-nav	2014-12-21 01:20:51 +02:00
stylesheets	Merge branch 'master' into sidebar-nav	2014-12-21 01:20:51 +02:00