projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1e9205 9416804)
Merge branch 'user/jboyer/claimsret_counts' of git.evergreen-ils.org:working/Evergree... user/jboyer/claimsret_counts
authorJason Boyer <jboyer1@library.in.gov>
Thu, 4 Sep 2014 18:19:00 +0000 (14:19 -0400)
committerJason Boyer <jboyer1@library.in.gov>
Thu, 4 Sep 2014 18:19:00 +0000 (14:19 -0400)
Conflicts:
Open-ILS/examples/fm_IDL.xml


Trivial merge
Evergreen ILS