projects / working / Evergreen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 19ce809 eed5316)
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into ubuntu-14-04... user/csharp/ubuntu-14-04-makefile-signoff
authorChris Sharp <csharp@georgialibraries.org>
Mon, 14 Jul 2014 16:53:07 +0000 (12:53 -0400)
committerChris Sharp <csharp@georgialibraries.org>
Mon, 14 Jul 2014 16:53:07 +0000 (12:53 -0400)
commita0d9851beef9b5282f0932f563fc3b7913cfcf63
tree56cbbfdcb24f3525207ccde02b5564503ccfff6ctree
parent19ce80956d8204f5ad2fbb63525f47b51d66090fcommit | diff
parenteed53164c530fa380ac313dec24ca84a25a6699dcommit | diff
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into ubuntu-14-04-makefile-signoff

Conflicts:
Open-ILS/src/extras/install/Makefile.ubuntu-trusty
docs/installation/server_installation.txt
docs/installation/server_installation.txt diff1 | diff2 | blob | history
Evergreen ILS