Merge remote-tracking branch 'origin/master'

This commit is contained in:
Blacktwin 2018-04-10 13:35:00 -04:00
commit a1fbe1f7fc

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>