Dmitriy Zaporozhets 71f6143552 Merge branch 'master' into new-sidebar ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/snippets_controller.rb		2015-04-23 12:08:03 +03:00
..
images	Remove old GitLab auth image	2015-03-22 09:05:13 +01:00
javascripts	Merge branch 'master' into new-sidebar	2015-04-23 12:08:03 +03:00
stylesheets	Fix toggle of sidebar	2015-04-22 16:48:39 +03:00