fnp
/
wolnelektury.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
63f47bb
2bdee8a
)
Merge branch 'django-1.5'
author
Radek Czajka
<radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 9 Apr 2013 09:12:01 +0000
(11:12 +0200)
committer
Radek Czajka
<radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 9 Apr 2013 09:12:01 +0000
(11:12 +0200)
1
2
apps/catalogue/templates/catalogue/book_text.html
patch
|
diff1
|
diff2
|
blob
|
history
apps/lesmianator/templates/lesmianator/poem.html
patch
|
diff1
|
diff2
|
blob
|
history
apps/wolnelektury_core/templates/main_page.html
patch
|
diff1
|
diff2
|
blob
|
history
apps/wolnelektury_core/templates/superbase.html
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/catalogue/templates/catalogue/book_text.html
Simple merge
diff --cc
apps/lesmianator/templates/lesmianator/poem.html
Simple merge
diff --cc
apps/wolnelektury_core/templates/main_page.html
Simple merge
diff --cc
apps/wolnelektury_core/templates/superbase.html
Simple merge