From ef69feeae79b300adaa9cb055842dd7d0a8528ff Mon Sep 17 00:00:00 2001
From: Benjamin Gamard <benjamin.gam@gmail.com>
Date: Mon, 30 Nov 2015 00:12:29 +0100
Subject: [PATCH 1/2] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 9caba2a6..95f20e5f 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ Features
 - Multi-users ACL system
 - Audit log
 - Comments
+- Storage quota per user
 - Document sharing by URL
 - RESTful Web API
 - Fully featured Android client

From bc323e994520e284fc3ec83b351da42a87af6701 Mon Sep 17 00:00:00 2001
From: jendib <benjamin.gam@gmail.com>
Date: Mon, 30 Nov 2015 00:28:51 +0100
Subject: [PATCH 2/2] #41: Don't update deleted user quota in batch

---
 .../main/java/com/sismics/docs/rest/resource/AppResource.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/AppResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/AppResource.java
index eb03376d..94a5977d 100644
--- a/docs-web/src/main/java/com/sismics/docs/rest/resource/AppResource.java
+++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/AppResource.java
@@ -228,7 +228,9 @@ public class AppResource extends BaseResource {
         
         // Save all users
         for (User user : userMap.values()) {
-            userDao.update(user);
+            if (user.getDeleteDate() == null) {
+                userDao.update(user);
+            }
         }
         
         // Always return OK