Isaac Connor ddf7b1ad43 Merge branch 'master' into storageareas ... Conflicts: web/skins/classic/js/dark.js web/skins/classic/js/flat.js		2016-01-14 09:41:24 -05:00
..
Makefile.am	Added missing javascript file to Makefile.am	2015-07-27 09:53:59 +02:00
classic.js	move the window size definitions into a separate file for each css version flat or classic	2015-05-01 16:02:55 -04:00
dark.js	Merge branch 'master' into storageareas	2016-01-14 09:41:24 -05:00
flat.js	Merge branch 'master' into storageareas	2016-01-14 09:41:24 -05:00
jquery-1.7.2.js	upgrade bundled jQuery (Closes: #785)	2015-04-15 11:39:29 +10:00
jquery.js	upgrade bundled jQuery (Closes: #785)	2015-04-15 11:39:29 +10:00
jquery.url	upgrade bundled jQuery (Closes: #785)	2015-04-15 11:39:29 +10:00
skin.js	move the window size definitions into a separate file for each css version flat or classic	2015-05-01 16:02:55 -04:00
skin.js.php	propagate canEditGroup permission	2015-08-15 13:22:13 -05:00