| commit | 823782ce1f2502e96c7fe48fbc94922d10af1a30 | |
| author | Oscar Carballal Prego <info@oscarcp.com> | |
| Wed, 19 Dec 2012 11:27:51 +0000 (19 12:27 +0100) | ||
| committer | Oscar Carballal Prego <info@oscarcp.com> | |
| Wed, 19 Dec 2012 11:27:51 +0000 (19 12:27 +0100) | ||
| tree | ab5881887fb7072a4ba826e59bf7ac4a531aaa21 | treesnapshot (tar.gz zip) |
| parent | bef9592258b16ae37cddf435842e0b858e108d17 | commitdiff |
| parent | 3e7df9f27b613886700b6288296030732e15e98b | commitdiff |
Merge branch 'ticket_228' of git://github.com/SantiMunin/e-cidadania into SantiMunin-ticket_228
Conflicts:
src/apps/ecidadania/voting/views.py
Conflicts:
src/apps/ecidadania/voting/views.py
| src/apps/ecidadania/voting/views.py | diff1 | diff2 | blobhistory |