Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 ... # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb		2016-03-21 23:22:21 +01:00
..
fonts	remove execution permissions from fonts	2016-01-21 01:31:17 -05:00
images	Crushed file size of emoji spritesheets	2016-02-19 11:45:26 +00:00
javascripts	Merge branch 'change_css_class_has_tooltip_to_has-tooltip' into 'master'	2016-03-21 20:40:14 +00:00
stylesheets	Merge branch 'master' into issue_12658	2016-03-21 23:22:21 +01:00