Skip to content
Snippets Groups Projects
Commit caf2246a authored by Shane Tomlinson's avatar Shane Tomlinson
Browse files

Merge remote branch 'origin/correct_includes' into dev

parents 60d88bd1 db44ce99
No related branches found
No related tags found
No related merge requests found
......@@ -33,7 +33,7 @@ echo ''
cd ../js
# re-minimize everything together
cat jquery-1.6.2.min.js ../dialog/resources/underscore-min.js ../dialog/resources/browserid-network.js browserid.js > lib.js
cat jquery-1.6.2.min.js ../dialog/resources/underscore-min.js ../dialog/resources/browserid-network.js ../dialog/resources/browserid-identities.js browserid.js > lib.js
$UGLIFY < lib.js > lib.min.js
cd ../css
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment