tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
1,860 Commits 29 Branches 403 Tags 28 MiB
f53c42faf0
Commit Graph

6 Commits

Author SHA1 Message Date
Ingo Schommer
34eb6678d8 Fixed dependency errors 
Probably a faulty merge from 2.4
 2014-02-10 11:23:11 +13:00
oilee80
61370e4116 Fix to pass Travis for 2.4 version of SS 2013-12-12 21:03:20 +01:00
Ingo Schommer
3aef9fef1e Merge remote-tracking branch 'origin/2.4' into post-2.4 
Conflicts:
	composer.json
	javascript/CMSMain_left.js
	javascript/LeftAndMain.js
 2013-01-06 22:37:56 +01:00
Ingo Schommer
4c525fe801 Fixed composer.json dependencies 2012-12-04 23:01:41 +01:00
Ingo Schommer
16eff71a7f Added composer branch alias 2012-11-28 22:01:00 +01:00
Ingo Schommer
7abb6eccc1 Added composer.json 2012-11-01 16:34:52 +01:00