Merge https://github.com/friendica/friendica into pull

2013-05-11 17:04:51 -07:00
parent e8fc26e74e b4bedbd082
commit aee7429967
41 changed files with 7762 additions and 252 deletions
--- a/util/minifyjs.sh
+++ b/util/minifyjs.sh
@@ -1,5 +1,7 @@
 #!/bin/bash

+command -v uglifyjs >/dev/null 2>&1 || { echo >&2 "I require UglifyJS but it's not installed.  Aborting."; exit 1; }
+
 MINIFY_CMD=uglifyjs

 JSFILES=(