projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a622326 01a5700)
Merge branch 'master' of git.evergreen-ils.org:history
authorGalen Charlton <gmcharlt@gmail.com>
Wed, 19 Mar 2014 14:45:06 +0000 (10:45 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Wed, 19 Mar 2014 14:45:06 +0000 (10:45 -0400)
Conflicts:
evergreen-history.txt

1  2 
evergreen-history.txt patch | diff1 | diff2 | blob | history

diff --cc evergreen-history.txt
index 8dc6c06,031f9a3..da40421
--- 1/evergreen-history.txt
--- 2/evergreen-history.txt
+++ b/evergreen-history.txt
@@@ -6,7 -6,7 +6,8 @@@
  2007-09-08 Dan Scott named a committer
  2005-07-27 Evergreen alpha release
  2009-05-20/2009-05-22 First Evergreen Conference held in Athens, Georgia
+ 2009-06-28 First wave of SCLENDS libraries go live, Beaufort County, State Library, Union County
 +2009-09-10 North Texas Library Consortium goes live on Evergreen.
  2010-04-21/2010-04-23 Second Evergreen Conference held in Grand Rapids, Michigan
  2011-04-27/2011-04-30 Third Evergreen Conference held in Decatur, Georgia
  2012-04-25/2012-04-28 Fourth Evergreen Conference held in Indianapolis, Indiana
Evergreen History