Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/Chat

# Conflicts:
#	PrototypChat/.vs/PrototypChat/v15/.suo
This commit is contained in:
Christian
2017-10-18 09:37:58 +02:00
4 changed files with 10 additions and 3 deletions

1
.gitignore vendored
View File

@@ -9,3 +9,4 @@
/BeWoPlanerChat/bewoplaner-chat-android/app/*.apk
/PrototypChat/.vs/PrototypChat/v14
/PrototypChat/.vs/PrototypChat/v15/sqlite3
/PrototypChat/.vs/PrototypChat/v15