oh god

- Merge with closedverse-video-support
- user_tools moved to forms.py
- community_tools moved to forms.py

README.foreskin

@@ -2,15 +2,27 @@ Stuff that is done:
 - Disable comments button
 - merge with closedverse-video-support (mostly)
 - Prevent users from posting in communities created by blocked users.
+<<<<<<< Updated upstream
+=======
+- Hide email password reset form if no SMTP server is set up. (done by Arian Kordi)
+
+- Fix icon and banner uploads.
+	Icons and banners use util.image_upload now, at the cost of having to set them all again.
+>>>>>>> Stashed changes
 
 Stuff that is in progress
 - Removing shitty code.
-- Finding and killing bugs!
+- moving to forms.py
 
 Stuff that I want
 - Image and video file boxes in one.
 - Pinning posts????
 	Not needed at all if I'm being honest.
 - Ways for mods to view who invited who.
+<<<<<<< Updated upstream
 - Hide email password reset form if no SMTP server is set up.
-- Fix icon and banner uploads. Make that shit work with image_upload
+- Fix icon and banner uploads. Make that shit work with image_upload
+=======
+- Full ImageField integration
+- remove the useless feedback thing. (You can just make a bug reporting community)
+>>>>>>> Stashed changes