Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	.gitignore
pull/17/head
eazzy 11 months ago
commit 047e9a09ed

2
.gitignore vendored

@ -1,3 +1,3 @@
/.idea/
/src/Notes/ /src/Notes/
/src/.idea/ /src/.idea/
/.idea/

Loading…
Cancel
Save