Dmitriy Kuzmenko 5a36613c97 Merge remote-tracking branch 'origin/develop' into develop ... # Conflicts: # apps/establishment/urls/back.py		2019-09-19 17:19:40 +03:00
..
__init__.py	version 0.0.5.1: added integration with facebook, refactored a lot	2019-08-09 09:56:16 +03:00
common.py	chnage image field to image_url in establishments	2019-09-19 17:18:08 +03:00
web.py	Fixed reset password	2019-09-18 11:50:39 +03:00