Merge branch 'geps/gep-032-database-backend' of https://github.com/gramps-project/gramps into geps/gep-032-database-backend

Browse Source

Conflicts:
	gramps/plugins/database/bsddb_support/upgrade.py

...

This commit is contained in:

Doug Blank 2015-05-26 20:11:32 -04:00

parent 8551a0b071 c830311aca

commit 7355adfc04

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available