projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f152fcf eed5316)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
authorBill Erickson <berick@esilibrary.com>
Mon, 14 Jul 2014 14:14:41 +0000 (10:14 -0400)
committerBill Erickson <berick@esilibrary.com>
Mon, 14 Jul 2014 14:14:41 +0000 (10:14 -0400)
1  2 
.gitignore patch | diff1 | diff2 | blob | history
Open-ILS/examples/fm_IDL.xml patch | diff1 | diff2 | blob | history
Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm patch | diff1 | diff2 | blob | history
Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm patch | diff1 | diff2 | blob | history

diff --cc .gitignore
index b42b3d4,76675d6..073c02d
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -350,8 -350,6 +350,9 @@@ Open-ILS/xul/staff_client/external/libm
  Open-ILS/xul/staff_client/xulrunner*.bz2
  Open-ILS/xul/staff_client/xulrunner*.zip
  Open-ILS/xul/staff_client/xulrunner-stub.exe
+ Thumbs.db
  /js*
  /JavaScript*
 +Open-ILS/web/js/ui/default/staff/build/
 +Open-ILS/web/js/ui/default/staff/node_modules/
 +Open-ILS/web/js/ui/default/staff/bower_components/
diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge
Evergreen ILS