From: Banana <mail@bananas-playground.net>
Date: Sat, 9 Oct 2021 08:34:54 +0000 (+0200)
Subject: master merge
X-Git-Tag: 1.5~17
X-Git-Url: http://91.132.146.200/gitweb/?a=commitdiff_plain;h=2971959e59528a539b41028ba2f0eb721f81449d;p=selfpaste.git

master merge
---

2971959e59528a539b41028ba2f0eb721f81449d
diff --cc CHANGELOG
index 1ec254c,25753da..e4f9274
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,5 -1,9 +1,9 @@@
- 202008xx version 1.2 Carbon
+ 202100321 version 1.3 Nitrogen
+ * Added new default allowed file types
+ * Cleanups
+ 
+ 20200814 version 1.2 Carbon
 -* Cleanup version only. No new fetures
 +* Cleanup version only. No new features
  
  20200530 version 1.1 Boron
  * House cleaning