Merge y resolucion de conflictos
No related branches found
No related tags found
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
app/management/__init__.py
0 → 100644
app/management/commands/__init__.py
0 → 100644
app/management/commands/borrar_memcached.py
0 → 100644
ipython==7.2.0 | ||
ipython-genutils==0.2.0 | ||
pymemcache==2.1.1 | ||
elastic-apm==3.0.0 | ||
asn1crypto==0.24.0 | ||
attrdict==2.0.0 | ||
certifi==2018.4.16 | ||
cffi==1.11.5 | ||
chardet==3.0.4 | ||
coincurve==9.0.0 | ||
coreapi==2.3.3 | ||
coreschema==0.0.4 | ||
cytoolz==0.9.0.1 | ||
... | ... | @@ -20,6 +19,8 @@ eth-keyfile==0.5.1 |
eth-keys==0.2.0b3 | ||
eth-rlp==0.1.2 | ||
eth-utils==1.0.3 | ||
ethereum==2.3.2 | ||
future==0.16.0 | ||
hexbytes==0.1.0 | ||
idna==2.7 | ||
itypes==1.1.0 | ||
... | ... | @@ -28,17 +29,29 @@ lru-dict==1.1.6 |
MarkupSafe==1.0 | ||
openapi-codec==1.3.2 | ||
parsimonious==0.8.0 | ||
pbkdf2==1.3 | ||
py-ecc==1.4.3 | ||
pycparser==2.18 | ||
pycryptodome==3.6.4 | ||
pyethash==0.1.27 | ||
PyJWT==1.6.4 | ||
pysha3==1.0.2 | ||
python-bitcoinlib==0.10.1 | ||
pytz==2018.5 | ||
PyYAML==4.2b4 | ||
raven==6.9.0 | ||
repoze.lru==0.7 | ||
requests==2.19.1 | ||
rlp==1.0.1 | ||
scrypt==0.8.6 | ||
simplejson==3.16.0 | ||
six==1.11.0 | ||
toolz==0.9.0 | ||
uritemplate==3.0.0 | ||
urllib3==1.23 | ||
web3==4.5.0 | ||
websockets==5.0.1 | ||
\ No newline at end of file | ||
websockets==5.0.1 | ||
elastic-apm==3.0.0 | ||
ipython==7.2.0 | ||
ipython-genutils==0.2.0 | ||
pymemcache==2.1.1 | ||
\ No newline at end of file |
Please register or sign in to comment