Merge y resolucion de conflictos
Showing
- README.md 3 additions, 1 deletionREADME.md
- TsaApi/local_settings_dev.py 33 additions, 4 deletionsTsaApi/local_settings_dev.py
- TsaApi/local_settings_preprod.py 47 additions, 4 deletionsTsaApi/local_settings_preprod.py
- TsaApi/local_settings_prod.py 7 additions, 1 deletionTsaApi/local_settings_prod.py
- app/management/__init__.py 0 additions, 0 deletionsapp/management/__init__.py
- app/management/commands/__init__.py 0 additions, 0 deletionsapp/management/commands/__init__.py
- app/management/commands/borrar_memcached.py 20 additions, 0 deletionsapp/management/commands/borrar_memcached.py
- app/management/commands/contenido_memcached.py 15 additions, 0 deletionsapp/management/commands/contenido_memcached.py
- app/management/commands/desatascar_pendientes.py 15 additions, 0 deletionsapp/management/commands/desatascar_pendientes.py
- app/utils.py 10 additions, 3 deletionsapp/utils.py
- requirements.txt 18 additions, 5 deletionsrequirements.txt
Loading
Please register or sign in to comment