]> git.evergreen-ils.org Git - working/Evergreen.git/commit
projects / working / Evergreen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4ed6029 a44f7e7)
Merge branch 'collab/bshum/mobile-cat-hacking' of git.evergreen-ils.org:working/Everg...
authorDan Scott <dscott@laurentian.ca>
Wed, 18 Sep 2013 21:16:53 +0000 (17:16 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 18 Sep 2013 21:16:53 +0000 (17:16 -0400)
commit020d58578a6f107265701c3c7165a21242d4a525
tree7a895c7e4bec1c02f46cd430c12a947ed2ce4e4dtree
parent4ed6029377c32da417c9c51cb2ef34629fba593acommit | diff
parenta44f7e76ad537553e672aa82115287f11b30a71bcommit | diff
Merge branch 'collab/bshum/mobile-cat-hacking' of git.evergreen-ils.org:working/Evergreen into mobile_facets_down

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
Open-ILS/src/templates/opac/css/style.css.tt2
Open-ILS/src/templates/opac/css/style.css.tt2 diff1 | diff2 | blob | history
Evergreen ILS