diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-05-18 11:30:25 +0200 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-05-18 11:30:25 +0200 |
| commit | 2e76ceb5b4c8abf860f9d078c80ae0fcbe1a4ffd (patch) | |
| tree | 6a803ea5efa8f6a93f04d657f3cb56a0b9ff5b17 /uploads | |
| parent | 1ed8ae2d8e86ed26d4e21f59e95995795bcb282b (diff) | |
| parent | 99eab1fa2a39b7a7fba6cdbb92c01e9c7c81aa88 (diff) | |
| download | pleroma-2e76ceb5b4c8abf860f9d078c80ae0fcbe1a4ffd.tar.gz pleroma-2e76ceb5b4c8abf860f9d078c80ae0fcbe1a4ffd.zip | |
Merge remote-tracking branch 'origin/develop' into status-notification-type
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
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 |