fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 73b6a16)
Merge branch 'preview'
authorJan Szejko <janek37@gmail.com>
Tue, 5 Jun 2018 14:46:14 +0000 (16:46 +0200)
committerJan Szejko <janek37@gmail.com>
Tue, 5 Jun 2018 15:11:50 +0000 (17:11 +0200)
# Conflicts:
# src/api/handlers.py
# src/catalogue/models/book.py
# src/catalogue/templates/catalogue/book_short.html


No differences found