diff options
author | lambda <pleromagit@rogerbraun.net> | 2018-12-17 20:36:21 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2018-12-17 20:36:21 +0000 |
commit | 3879500c87829a5cf1377ca7ccdb7bf92c75367f (patch) | |
tree | 41712c389aeba5fe31750140b359fd4f5ef040a8 /.gitignore | |
parent | 7d9254fb4aa17d0b6a7f5358fb5bc7a0406d1a30 (diff) | |
parent | eb2d34eb6cc3257a260994b7b144a80dd254602c (diff) | |
download | pleroma-3879500c87829a5cf1377ca7ccdb7bf92c75367f.tar.gz pleroma-3879500c87829a5cf1377ca7ccdb7bf92c75367f.zip |
Merge branch '2018-12-17-update-frontend' into 'develop'
2018 12 17 update frontend
See merge request pleroma/pleroma!565
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions