Merge remote-tracking branch 'origin/master'

This commit is contained in:
Oliver 2018-04-17 23:15:05 +10:00
commit 503c3ec464

5
.gitignore vendored
View File

@ -28,4 +28,7 @@ local_settings.py
*.sqlite3
# Local media storage (only when running in development mode)
InvenTree/media
InvenTree/media
# Ignore PyCharm project configuration
.idea/