Oliver Walters 731ec25b24 Merge remote-tracking branch 'inventree/master' into django-q ... # Conflicts: # .github/workflows/style.yaml # .travis.yml # InvenTree/InvenTree/settings.py		2021-03-31 22:17:38 +11:00
..
migrations	Added missing migration file (how did it escape?)	2021-01-13 17:33:55 -05:00
__init__.py	Added User API and serializer	2017-04-20 22:40:59 +10:00
admin.py	Merged master	2021-01-13 17:08:01 -05:00
api.py	Unit tests for new role view	2021-02-26 20:37:12 +11:00
apps.py	Added owner model to admin page and added test cases	2021-01-13 11:38:37 -05:00
models.py	Merge remote-tracking branch 'inventree/master' into django-q	2021-03-31 22:17:38 +11:00
serializers.py	Include PK in user serializer	2019-06-23 22:44:57 +10:00
test_migrations.py	PEP fixes	2021-03-30 10:00:43 +11:00
tests.py	Added owner model to admin page and added test cases	2021-01-13 11:38:37 -05:00
urls.py	URL tweaks	2021-02-27 22:41:36 +11:00