projects / contrib / Conifer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b66817d 6ebb789)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/tpac-non-fixed...
authorDan Scott <dscott@laurentian.ca>
Thu, 8 Dec 2011 19:01:57 +0000 (14:01 -0500)
committerDan Scott <dscott@laurentian.ca>
Thu, 8 Dec 2011 19:01:57 +0000 (14:01 -0500)
commit8b3b014c4b84aeab438093c4a2925fb11a3f5cff
tree10e6c7d452f9a894cf0c45ad76ec02c98dff487dtree
parentb66817dc66ed35c64bc80a70d7c9f328be8d4d61commit | diff
parent6ebb789434cb554ce1036d92a4dded3ecf23b989commit | diff
Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/tpac-non-fixed-width

Conflicts:
Open-ILS/web/css/skin/default/opac/style.css

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Open-ILS/src/templates/opac/myopac/circs.tt2 diff1 | diff2 | blob | history
Open-ILS/src/templates/opac/myopac/lists.tt2 diff1 | diff2 | blob | history
Open-ILS/web/css/skin/default/opac/style.css diff1 | diff2 | blob | history
Evergreen contribs