projects / contrib / Conifer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 24007bf ba6ffe0)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/unnest_master
authorDan Scott <dan@coffeecode.net>
Sat, 11 Jun 2011 11:03:29 +0000 (07:03 -0400)
committerDan Scott <dan@coffeecode.net>
Sat, 11 Jun 2011 11:04:12 +0000 (07:04 -0400)
commit68f872f4f683d1557df9f0e67b2e645d51f608d2
tree7d02b267893c1ac4eb0aa181f01dd7dbec89031ctree
parent24007bf27d6f53073cfb45e4db43b88f651b971bcommit | diff
parentba6ffe0fe4140cc6761f2a9fff65e38649b8925ccommit | diff
Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/unnest_master

Also update the now-conflicting SQL upgrade scripts.

Conflicts:
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/sql/Pg/002.schema.config.sql diff1 | diff2 | blob | history
Open-ILS/src/sql/Pg/upgrade/0555.unnest_oils_xpath_table.sql | | blob
Open-ILS/src/sql/Pg/upgrade/0556.unnest_biblio_extract_metabib_field_entry.sql | | blob
Evergreen contribs