diff options
author | lain <lain@soykaf.club> | 2024-03-18 14:26:19 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2024-03-18 14:26:19 +0000 |
commit | 0e4e20315bd8bc743f017db462debfd968066c81 (patch) | |
tree | c24048268c9370fb8b4239e709027749b068a280 /uploads | |
parent | cf0aa1238ccd137219253d76355f2dc0f89679ac (diff) | |
parent | 60c4cb21ea329e7256297242b05b7f1e9d53e314 (diff) | |
download | pleroma-0e4e20315bd8bc743f017db462debfd968066c81.tar.gz pleroma-0e4e20315bd8bc743f017db462debfd968066c81.zip |
Merge branch 'bookmark-folders' into 'develop'
Bookmark folders
See merge request pleroma/pleroma!4080
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 |