Merge branch 'hj-happiness-improvement' into 'develop'

Browse source

New frontend configuration mechanism.

Closes #445

See merge request pleroma/pleroma!700

...

This commit is contained in:

kaniini 2019-01-29 13:54:10 +00:00

parent ebb3496386 f53d464db0

commit d03a116654

8 changed files with 159 additions and 19 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

priv/static/images/city.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 MiB