fnp / redakcja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbc3c64 7117aea)
Merge branch 'master' into ofop
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Mon, 22 Jul 2013 11:34:51 +0000 (13:34 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Mon, 22 Jul 2013 11:34:51 +0000 (13:34 +0200)
Conflicts:
apps/toolbar/fixtures/initial_toolbar.yaml
redakcja/static/xsl/wl2html_client.xsl

1  2 
redakcja/settings/compress.py patch | diff1 | diff2 | blob | history
redakcja/static/xsl/wl2html_client.xsl patch | diff1 | diff2 | blob | history
requirements.txt patch | diff1 | diff2 | blob | history

diff --cc redakcja/settings/compress.py
Simple merge
diff --cc requirements.txt
Simple merge