]> git.evergreen-ils.org Git - working/Evergreen.git/commit
Merge remote-tracking branch 'eg-working/user/dbs/lp894052-version-upgrade'
authorMike Rylander <mrylander@gmail.com>
Thu, 29 Dec 2011 17:15:25 +0000 (12:15 -0500)
committerMike Rylander <mrylander@gmail.com>
Thu, 29 Dec 2011 17:15:46 +0000 (12:15 -0500)
commit21adee5d2d4ad32cfd299edf72e3d70ec1428939
tree12f02ebfc3dfe40451c835d661aad31b8c0d2b78
parentea71899306e026bd0c9c91180a0af76a55fbec08
parent27d6d7a7c05ca944de70f1f033c9333c3ed5128e
Merge remote-tracking branch 'eg-working/user/dbs/lp894052-version-upgrade'

One merge conflict in 2.0-2.1-upgrade-db.sql silenced with -X theirs.  See
LP#894052 for details.

Signed-off-by: Mike Rylander <mrylander@gmail.com>