Commit d7331c98 authored by Mathias Vehus's avatar Mathias Vehus
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	production.db
parents cb74abb5 b62d1b95
......@@ -19,6 +19,7 @@
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml
.idea/compiler.xml
# Gradle:
.idea/gradle.xml
......@@ -27,6 +28,10 @@
# Mongo Explorer plugin:
.idea/mongoSettings.xml
## Database files:
/production.db
*.db
## File-based project format:
*.iws
......@@ -53,5 +58,3 @@ fabric.properties
# *.iml
# modules.xml
*.db
No preview for this file type
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment