merging master

This commit is contained in:
Peli de Halleux
2016-11-09 13:20:18 -08:00
22 changed files with 498 additions and 263 deletions

View File

@@ -180,13 +180,13 @@
"appTheme": {
"accentColor": "#249899",
"defaultLocale": "de",
"logoUrl": "https://calliope.cc/about",
"logoUrl": "https://calliope.cc/",
"logo": "./static/Calliopeminieditor.svg",
"docsLogo": "./static/Calliopeminieditor.svg",
"docsLogo": "./static/Logo_Calliope_Woman.svg",
"portraitLogo": "./static/Logo_Calliope_Woman.svg",
"footerLogo": "./static/Calliopeminieditor.svg",
"cardLogo": "https://az851932.vo.msecnd.net/pub/drbwxcth",
"appLogo": "https://az851932.vo.msecnd.net/pub/tbhemtig",
"cardLogo": "./static/icons/apple-touch-icon.png",
"appLogo": "./static/icons/apple-touch-icon.png",
"homeUrl": "https://calliope.cc/",
"privacyUrl": "https://go.microsoft.com/fwlink/?LinkId=521839",
"termsOfUseUrl": "https://go.microsoft.com/fwlink/?LinkID=206977",