From: Bill Erickson <berick@esilibrary.com>
Date: Mon, 14 Jul 2014 14:14:41 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a73b4460df3b9769e9d4ccf632c641a92eb63b84;p=working%2FEvergreen.git

Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
---

a73b4460df3b9769e9d4ccf632c641a92eb63b84
diff --cc .gitignore
index b42b3d4eff,76675d67a1..073c02dc1f
--- a/.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/