Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into geps/gep-032-database-backend

Browse Source
This commit is contained in:
Doug Blank 2015-05-14 15:15:24 -04:00
commit d4688589d8
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps/gen/config.py
View File

@ -150,7 +150,7 @@ register('behavior.surname-guessing', 0)
register('behavior.use-tips', False)
register('behavior.welcome', 100)
register('behavior.web-search-url', 'http://google.com/#&q=%(text)s')
register('behavior.addons-url', "http://svn.code.sf.net/p/gramps-addons/code/trunk/")
register('behavior.addons-url', "https://raw.githubusercontent.com/gramps-project/addons/master/gramps42")
register('export.proxy-order', [
["privacy", 0],

3
gramps/gui/glade/dbman.glade
View File

@ -54,8 +54,8 @@
<object class="GtkLabel" id="label714">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Version description</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@ -275,7 +275,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="resize_mode">immediate</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>