?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: dd99f0b) | patch
Fixed git merge errors
commitc308b3b16d5d22157ad5c95869405aaff52b8b2b
authorOscar Carballal Prego <info@oscarcp.com>
Mon, 25 Feb 2013 09:15:26 +0000 (25 10:15 +0100)
committerOscar Carballal Prego <info@oscarcp.com>
Mon, 25 Feb 2013 09:15:26 +0000 (25 10:15 +0100)
treeecfd9907074e378f1e5b8fc37b3ee5550e1ff9fctree | snapshot (tar.gz zip)
parentdd99f0b6c401e0bccb8671a5a4af389da53ef2aecommit | diff
Fixed git merge errors
src/apps/ecidadania/proposals/views/common.py diff | blob | blame | history
e-cidadania is an open source based project to give citizens a way to be heared by their representatives.