Kyle M Hall 3a2048eeff Bug 11360 - Fix merge conflict ... Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>		2016-09-03 00:17:20 +00:00
..
js	Bug 16456: Add Font Awesome icons to some buttons in Tools module, section Patrons and circulation	2016-06-17 15:40:24 +00:00
lib	Bug 13501: Add JS library select2 3.5.4	2016-09-02 16:25:04 +00:00
prog	Bug 11360 - Fix merge conflict	2016-09-03 00:17:20 +00:00