| commit | e0d091507cafeff4635af8d289a70da4b63121d0 | |
| author | Oscar Carballal Prego <info@oscarcp.com> | |
| Mon, 25 Mar 2013 14:23:07 +0000 (25 15:23 +0100) | ||
| committer | Oscar Carballal Prego <info@oscarcp.com> | |
| Mon, 25 Mar 2013 14:23:07 +0000 (25 15:23 +0100) | ||
| tree | 1e541775ed3e2c650c5b7734a86c9ed156b77b3e | treesnapshot (tar.gz zip) |
| parent | 4620aa4d593aedc9e0d6ead2d221826b82263aad | commitdiff |
| parent | ef4667cfb3e3551e7c1556a9063dc1fde405ca6b | commitdiff |
Merge branch 'master' of git://github.com/piyushbansal/e-cidadania into piyushbansal-master
Conflicts:
src/core/spaces/views/spaces.py
Conflicts:
src/core/spaces/views/spaces.py