Reena-cell 3ae195a7a5 Merge branch 'develop-master-merge' into develop ... # Conflicts: # apimanager/apimanager/settings.py # apimanager/apimanager/urls.py # apimanager/atms/templates/atms/update.html # apimanager/base/templates/base.html # apimanager/base/templates/home.html # apimanager/locale/de/LC_MESSAGES/django.mo # apimanager/locale/de/LC_MESSAGES/django.po # apimanager/locale/es/LC_MESSAGES/django.mo # apimanager/locale/es/LC_MESSAGES/django.po # apimanager/locale/fr/LC_MESSAGES/django.mo # apimanager/locale/fr/LC_MESSAGES/django.po # apimanager/locale/hi/LC_MESSAGES/django.mo # apimanager/locale/hi/LC_MESSAGES/django.po # apimanager/metrics/templates/metrics/custom_summary.html		2022-05-31 14:31:24 +02:00
..
static/branches	Add Branches page #75	2019-02-08 12:35:51 +08:00
templates/branches	Merge branch 'develop-master-merge' into develop	2022-05-31 14:31:24 +02:00
__init__.py	check pagination / sorting of entitlement requests #76	2019-02-13 19:38:08 +08:00
admin.py	check pagination / sorting of entitlement requests #76	2019-02-13 19:38:08 +08:00
apps.py	check pagination / sorting of entitlement requests #76	2019-02-13 19:38:08 +08:00
forms.py	branch update api	2019-02-15 20:55:53 +08:00
models.py	check pagination / sorting of entitlement requests #76	2019-02-13 19:38:08 +08:00
tests.py	check pagination / sorting of entitlement requests #76	2019-02-13 19:38:08 +08:00
urls.py	Add Branches page #75	2019-02-08 12:35:51 +08:00
views.py	feature ATMs	2022-05-23 09:58:51 +02:00