Chris Cormack ac5047b887 Follow up patch, removing missed conflict marker ... Signed-off-by: Galen Charlton <gmcharlt@gmail.com>		2010-06-19 07:23:50 -04:00
..
css	Use CSS3 box-shadow property for Cart tooltip	2010-05-04 11:19:03 -04:00
includes	Follow up patch, removing missed conflict marker	2010-06-19 07:23:50 -04:00
js	(MT3174) acqui/neworderempty.pl: incrementing the quantity when adding an item	2010-04-23 06:57:51 -04:00
lib	Use CSS3 box-shadow property for Cart tooltip	2010-05-04 11:19:03 -04:00
modules	Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module	2010-06-19 07:23:46 -04:00
xslt	bug 4018: remove duplicate unAPI link when XSLT bib details display on	2010-05-25 09:29:31 -04:00
columns.def	MT 2269, Follow-up : Granular permissions for items batch modification and deletion	2010-04-29 21:55:39 -04:00