Commit Graph

4 Commits

Author SHA1 Message Date
Ingo Schommer
7803d982bb Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts:
	.travis.yml
	composer.json
2013-04-30 00:43:30 +02:00
Ingo Schommer
c26b83ebfb Less trademark-encumbered doc icons (fixed #1787)
Thanks to http://p.yusukekamiyamane.com/
2013-04-30 00:41:58 +02:00
Ingo Schommer
ce8e72cf0e MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
Hayden Smith
4a5d9b03f8 Moved Sapphire module to open source path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 10:40:28 +00:00