Merge remote-tracking branch 'origin/master' into profile-001-1-create-project

Conflicts:
	plugins/c9.profile.page.project/project-page.js
	settings/devel/workspace-types.js
	settings/devel/workspace-types_test.js
This commit is contained in:
Matthijs van Henten 2015-04-24 13:46:52 +00:00
parent 038ca066a1
commit 2b66ec5230

View File

@ -95,6 +95,7 @@
"c9.ide.readonly": "#f6f07bbe42",
"c9.ide.recentfiles": "#7c099abf40",
"c9.ide.remote": "#cd45e81d2f",
"c9.ide.processlist": "#bc11818bb5",
"c9.ide.run": "#71c5562e42",
"c9.ide.run.build": "#ad45874c88",
"c9.ide.run.debug.xdebug": "#b91d23f48b",