Merge remote-tracking branch 'origin/master'

2013-06-24 15:13:48 +02:00 · 2013-06-24 15:13:48 +02:00 · 4d897839bf
commit 4d897839bf
parent 84867b45f5 39a0b5c31b
1 changed files with 1 additions and 0 deletions
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@ -129,6 +129,7 @@ if [ -d po ] ; then
    rm -rf po
 fi

+# This can be removed once 4.0 is out of maintenance:
 if [ -f ./scripts/compress-js ] ; then
    echo "* Compressing javascript files"
    ./scripts/compress-js