Merge branch 'api' into filmowa
authorJan Szejko <jan.szejko@gmail.com>
Mon, 20 Jun 2016 12:43:04 +0000 (14:43 +0200)
committerJan Szejko <jan.szejko@gmail.com>
Mon, 20 Jun 2016 12:43:04 +0000 (14:43 +0200)
commit47336ec077dcbae1fc40a01a1054cd28224a1649
treeac188dccfece35f004fa1be60eab42c265702018
parent97d42b897db361883d790f514ac60b18d5bd14f5
parentdb3d82c09c614b072f5f6006a6c195a9f7874e08
Merge branch 'api' into filmowa
edumed/urls.py