fnp / redakcja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 861a08c f1b70c0)
Merge branch 'master' of stigma:platforma
authorŁukasz Rekucki <lrekucki@gmail.com>
Wed, 30 Sep 2009 14:17:50 +0000 (16:17 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Wed, 30 Sep 2009 14:17:50 +0000 (16:17 +0200)
1  2 
apps/api/handlers/library_handlers.py patch | diff1 | diff2 | blob | history
project/settings.py patch | diff1 | diff2 | blob | history

diff --cc apps/api/handlers/library_handlers.py
Simple merge
diff --cc project/settings.py
Simple merge