diff options
author | kaniini <nenolod@gmail.com> | 2019-01-29 13:54:10 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-01-29 13:54:10 +0000 |
commit | d03a116654bd7c4329b698a0f175e37aea8c2caa (patch) | |
tree | b5ea94fb5a001d3b2d3858921c480f8f58fb077b /lib/mix | |
parent | ebb3496386c1e195b48bcdc9d72c4c30e60fe340 (diff) | |
parent | f53d464db0194eb66557b00c7d92b9df8c798ada (diff) | |
download | pleroma-d03a116654bd7c4329b698a0f175e37aea8c2caa.tar.gz |
Merge branch 'hj-happiness-improvement' into 'develop'
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
Diffstat (limited to 'lib/mix')
0 files changed, 0 insertions, 0 deletions