diff options
author | marcin mikołajczak <git@mkljczk.pl> | 2024-04-06 10:42:23 +0200 |
---|---|---|
committer | marcin mikołajczak <git@mkljczk.pl> | 2024-04-06 10:42:23 +0200 |
commit | 01a5f839c58d89be802e162280bd02c577bdec89 (patch) | |
tree | 8655b5bc8221f4dd0e1086c5d6dd1b8c97c0abc8 /uploads | |
parent | 918c406a914d49b15beb3611e1c780d0e0d253cd (diff) | |
parent | 987f44d81142e11b008659f3fbdf9baf69a1e9d8 (diff) | |
download | pleroma-01a5f839c58d89be802e162280bd02c577bdec89.tar.gz pleroma-01a5f839c58d89be802e162280bd02c577bdec89.zip |
Merge remote-tracking branch 'origin/develop' into instance_rules
Diffstat (limited to 'uploads')
-rw-r--r-- | uploads/.gitignore | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/uploads/.gitignore b/uploads/.gitignore deleted file mode 100644 index 523e584a7..000000000 --- a/uploads/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Git will ignore everything in this directory except this file. -* -!.gitignore |