littlewolf 22d2396c6b Merge branch 'develop' into feature/migrate-city-objects ... # Conflicts: # docker-compose.yml # project/settings/base.py		2019-10-09 07:54:15 +03:00
..
migrations	refactor this feature	2019-10-02 12:35:01 +03:00
urls	Fixed urls and tests for news	2019-09-25 13:17:24 +05:00
views	slugs for news & establishments	2019-09-24 10:38:04 +03:00
__init__.py	version 0.0.6 new models and api for News	2019-08-13 15:23:00 +03:00
admin.py	Merge remote-tracking branch 'origin/feature/sending-news-email' into feature/sending-news-email	2019-10-02 13:31:29 +05:00
apps.py	version 0.0.6 new models and api for News	2019-08-13 15:23:00 +03:00
filters.py	establishment list view - added filter by country code	2019-09-02 09:56:55 +03:00
models.py	Merge branch 'feature/es' into develop	2019-10-04 12:11:12 +03:00
serializers.py	refactor this feature	2019-10-02 12:35:01 +03:00
tasks.py	fix bug	2019-10-02 13:37:46 +05:00
tests.py	Fix some test && routes && add migration	2019-09-27 19:03:30 +03:00
transfer.py	added transfer.py to partner	2019-10-04 16:20:04 +05:00
views.py	Fix code	2019-10-04 10:20:36 +03:00