5ff427d9e9
Conflicts: Makefile.am misc/Makefile.am src/Makefile.am web/includes/Makefile.am web/js/Makefile.am web/skins/classic/css/classic/views/Makefile.am web/skins/classic/css/flat/views/Makefile.am web/skins/classic/views/Makefile.am web/skins/classic/views/js/Makefile.am |
||
---|---|---|
.. | ||
classic.js | ||
dark.js | ||
flat.js | ||
jquery-1.11.3.js | ||
jquery.js | ||
jquery.url | ||
skin.js | ||
skin.js.php |