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

Conflicts: .travis.yml composer.json
2013-04-30 00:43:30 +02:00 · 2013-04-30 00:43:30 +02:00 · 7803d982bb
parent 5f91c3724d c26b83ebfb
commit 7803d982bb
4 changed files with 1 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -43,4 +43,4 @@ branches:
 notifications:
  irc:
    channels:
-     - "irc.freenode.org#silverstripe"
+     - "irc.freenode.org#silverstripe"
--- a/images/app_icons/doc_32.gif
+++ b/images/app_icons/doc_32.gif
--- a/images/app_icons/pdf_32.gif
+++ b/images/app_icons/pdf_32.gif
--- a/images/app_icons/xls_32.gif
+++ b/images/app_icons/xls_32.gif