From: Jan Szejko <janek37@gmail.com>
Date: Wed, 19 Dec 2018 13:46:37 +0000 (+0100)
Subject: Merge branch 'app'
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/875efc3090b43807d41438a98f3e84ceafecab51?ds=sidebyside

Merge branch 'app'

# Conflicts:
#	lib/librarian
---

875efc3090b43807d41438a98f3e84ceafecab51
diff --cc lib/librarian
index 7dc1b2c84,0e7deb203..df1ef1a80
--- a/lib/librarian
+++ b/lib/librarian
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 7dc1b2c84ca9b53454d9eb0c296b4f005dcb780c
 -Subproject commit 0e7deb2034ce53924098ecab626c5d763d9a9700
++Subproject commit df1ef1a80800b58ae6d818f5bdb0ff919c558d37