Merge dev-settings into dev

This commit is contained in:
DariusIII
2016-11-03 10:26:48 +01:00
parent 27f390c0a4
commit 0a950ed034
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -16,8 +16,8 @@
</last>
</scripts>
<sql>
<db>275</db>
<file>275</file>
<db>276</db>
<file>276</file>
</sql>
</versions>
</nntmux>
@@ -8,7 +8,7 @@ UPDATE settings SET subsection = 'release' WHERE setting = 'maxsizetoformrelease
UPDATE settings SET subsection = 'release' WHERE setting = 'minfilestoformrelease';
UPDATE settings SET section = 'archive', subsection = 'fetch' name = 'end' WHERE setting = 'fetchlastcompressedfiles';
UPDATE settings SET section = 'archive', subsection = 'fetch', name = 'end' WHERE setting = 'fetchlastcompressedfiles';
UPDATE settings SET section = 'APIs' WHERE setting = 'amazonassociatetag';
@@ -136,7 +136,7 @@ UPDATE settings SET section = 'site', subsection = 'google', name = 'google_adse
UPDATE settings SET section = 'site', subsection = 'google', name = 'google_analytics_acc' WHERE setting = 'google_analytics_acc';
INSERT IGNORE INTO settings (section, subsection, name, value, hint, setting) VALUES (shell, date, format, '%Y-%m-%d %T', 'Format string to use in shell''s date command output. See `man date` for acceptable format.\nDefault: %Y-%m-%d %T', 'shell.date.format');
INSERT IGNORE INTO settings (section, subsection, name, value, hint, setting) VALUES ('shell', 'date', 'format', '%Y-%m-%d %T', 'Format string to use in shell date command output. See `man date` for acceptable format.\nDefault: %Y-%m-%d %T', 'shell.date.format');