Merge remote-tracking branch 'origin/master'

This commit is contained in:
Oliver committed 2018-04-17 23:15:05 +10:00
commit 503c3ec464
1 file changed
+3
+3
View File
@@ -29,3 +29,6 @@ local_settings.py
# Local media storage (only when running in development mode)
InvenTree/media
# Ignore PyCharm project configuration
.idea/