Merge branch 'app'
authorJan Szejko <janek37@gmail.com>
Wed, 19 Dec 2018 13:46:37 +0000 (14:46 +0100)
committerJan Szejko <janek37@gmail.com>
Wed, 19 Dec 2018 13:46:37 +0000 (14:46 +0100)
# Conflicts:
# lib/librarian

1  2 
lib/librarian

diff --combined lib/librarian
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 7dc1b2c84ca9b53454d9eb0c296b4f005dcb780c
 -Subproject commit 0e7deb2034ce53924098ecab626c5d763d9a9700
++Subproject commit df1ef1a80800b58ae6d818f5bdb0ff919c558d37