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
..
classic	Merge branch 'master' into storageareas	2016-01-14 09:41:24 -05:00
mobile	fix montage view issue in mobile skin	2015-06-26 08:47:20 -05:00
xml	add translate function	2015-05-10 08:10:30 -05:00
Makefile.am	remove the flat subdir	2014-12-01 15:55:22 -05:00