Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop

This commit is contained in:
sadposter 2020-12-29 13:25:38 +00:00
commit edb5826072
121 changed files with 7584 additions and 1777 deletions

File diff suppressed because it is too large Load diff

View file

@ -267,6 +267,7 @@
},
"colors": {
"bg": "#c0c0c0",
"wallpaper": "#008080",
"text": "#000000",
"link": "#0000ff",
"accent": "#000080",

View file

@ -258,6 +258,7 @@
},
"colors": {
"bg": "#c0c0c0",
"wallpaper": "#008080",
"text": "#000000",
"link": "#0000ff",
"accent": "#000080",

View file

@ -240,6 +240,7 @@
},
"colors": {
"bg": "#d6d6ce",
"wallpaper": "#396ba5",
"text": "#000000",
"link": "#0000ff",
"accent": "#0a246a",