fnp / edumed.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97d42b8 db3d82c)
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)
1  2 
edumed/urls.py patch | diff1 | diff2 | blob | history

diff --cc edumed/urls.py
Simple merge