diff options
| author | Alex S <alex.strizhakov@gmail.com> | 2019-05-01 12:29:33 +0700 |
|---|---|---|
| committer | Alex S <alex.strizhakov@gmail.com> | 2019-05-01 12:29:33 +0700 |
| commit | bdfa3a6fa87f95e93aa853ec4961645215f31221 (patch) | |
| tree | 467b9dd762c9878541e34f2b38a1c58e387c8f2c /uploads | |
| parent | 97b35e00b049c8f908484163b5ffdbcb55db7867 (diff) | |
| parent | 77690b9d03facf74483e3379f72b5b51c9f1bd4e (diff) | |
| download | pleroma-bdfa3a6fa87f95e93aa853ec4961645215f31221.tar.gz pleroma-bdfa3a6fa87f95e93aa853ec4961645215f31221.zip | |
Merging with develop
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
Diffstat (limited to 'uploads')
| -rw-r--r-- | uploads/.gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/uploads/.gitignore b/uploads/.gitignore new file mode 100644 index 000000000..523e584a7 --- /dev/null +++ b/uploads/.gitignore @@ -0,0 +1,3 @@ +# Git will ignore everything in this directory except this file. +* +!.gitignore |