Merge branch 'master' into 'marijn-postdelete'

# Conflicts: # website/public/js/masonry.js
2017-02-01 14:41:45 +01:00
parent dbfe10f84b 7955509cb2
commit 96f421d088
9 changed files with 210 additions and 87 deletions
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -71,6 +71,10 @@

    </div>

+    <div class="noposts platform">
+        <p>Geen posts meer!</p>
+    </div>
+
    <div class="modal">
        <div class="modal-content platform">
            <div class="modal-close">