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

Conflicts: .travis.yml composer.json
2024-10-22 09:05:53 +00:00 · 2013-05-17 00:38:26 +02:00 · 2013-05-17 00:38:26 +02:00 · d7c937710a
commit d7c937710a
parent 04bb85a78d f8cfb5afd6
2 changed files with 2 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -43,4 +43,4 @@ branches:
 notifications:
  irc:
    channels:
-     - "irc.freenode.org#silverstripe"
+     - "irc.freenode.org#silverstripe"
--- a/composer.json
+++ b/composer.json
@ -23,4 +23,4 @@
 	"autoload": {
 		"classmap": ["tests/behat/"]
 	}
-}
+}