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)
commit875efc3090b43807d41438a98f3e84ceafecab51
treeab9e08d517f5c76bfd224a1cc384e63e4a35b58e
parent8f6b785048f9095b4b985836dc8cf97c160f3a0f
parent06cf0f20747a6d076641a6f9b486acebb000841c
Merge branch 'app'

# Conflicts:
# lib/librarian
lib/librarian