Merge remote-tracking branch 'origin/2.4' into 3.0

Browse Source

Conflicts:
	composer.json

...

This commit is contained in:

Ingo Schommer 2013-08-07 20:37:03 +02:00

parent cff42f2338 69889ec786

commit b1eba0f9b9

1 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/Uploads/SilverStripeLogo.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 12 KiB After Width:  |  Height:  |  Size: 19 KiB