Merge commit 'afa715cf1b113f970ab9b698e4acad33178836ef' into v0.6

- change default time and date format (when running BM for the first
  time)
This commit is contained in:
Peter Šurda 2016-08-14 12:35:43 +02:00
commit 45630b779b
Signed by: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87

View File

@ -60,7 +60,7 @@ def loadConfig():
shared.config.set('bitmessagesettings', 'settingsversion', '10') shared.config.set('bitmessagesettings', 'settingsversion', '10')
shared.config.set('bitmessagesettings', 'port', '8444') shared.config.set('bitmessagesettings', 'port', '8444')
shared.config.set( shared.config.set(
'bitmessagesettings', 'timeformat', '%%a, %%d %%b %%Y %%I:%%M %%p') 'bitmessagesettings', 'timeformat', '%%c')
shared.config.set('bitmessagesettings', 'blackwhitelist', 'black') shared.config.set('bitmessagesettings', 'blackwhitelist', 'black')
shared.config.set('bitmessagesettings', 'startonlogon', 'false') shared.config.set('bitmessagesettings', 'startonlogon', 'false')
if 'linux' in sys.platform: if 'linux' in sys.platform: