Eric Eastwood 3468ca835d Merge branch 'master' into ff_port_from_ee ... Conflicts: app/models/project.rb db/schema.rb		2017-09-28 16:59:49 -05:00
..
images	Check for exec permissions also in app/	2017-09-25 10:59:25 +02:00
javascripts	Merge branch 'master' into ff_port_from_ee	2017-09-28 16:59:49 -05:00
stylesheets	Merge branch 'cleanup-css' into 'master'	2017-09-27 22:03:44 +00:00