diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-01-09 16:56:31 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-01-09 16:56:31 +0700 |
| commit | 48591aab980d92823b51d2363fcd4b64d311739a (patch) | |
| tree | 0bceebfbc8e96c7999683168b62b1e4f88272625 /lib/mix/tasks/pleroma/sample_config.eex | |
| parent | 0c750bc432a6329be7f0dc15707e46625b11faf3 (diff) | |
| parent | 5c5c8508c203886f32b150e7d8c1f7362a4fde0e (diff) | |
| download | pleroma-48591aab980d92823b51d2363fcd4b64d311739a.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
# Conflicts:
# docs/config.md
Diffstat (limited to 'lib/mix/tasks/pleroma/sample_config.eex')
0 files changed, 0 insertions, 0 deletions