Merge remote branch 'upstream/master' into nice-pad-url

This commit is contained in:
Wikinaut 2012-02-05 00:38:23 +01:00
commit 5af7e8da7f
8 changed files with 51 additions and 251 deletions

View file

@ -18,10 +18,10 @@
, "pad_impexp.js"
, "pad_savedrevs.js"
, "pad_connectionstatus.js"
, "jquery-ui.js"
, "chat.js"
, "excanvas.js"
, "farbtastic.js"
, "prefixfree.js"
]
, "timeslider.js": [
"jquery.js"