Merge branch 'feature-api'
commitcddb0c763ad9a0c4e66c930bb71e2dac43ba2c58
authorOscar Carballal Prego <info@oscarcp.com>
Wed, 9 Oct 2013 18:06:29 +0000 (9 20:06 +0200)
committerOscar Carballal Prego <info@oscarcp.com>
Wed, 9 Oct 2013 18:06:29 +0000 (9 20:06 +0200)
treef87e2dc314b169d9ac136348ee4436444da2d052
parentb58d84b69c726ec7d88755579d780ed4095e21df
parent186e351e91f983943b404af6d787b5c341cb64b6
Merge branch 'feature-api'
src/e_cidadania/settings/defaults.py