Merge branch 'develop' into server_2.0

This commit is contained in:
Luis Ángel San Martín 2018-04-27 23:14:40 +02:00
commit a4941553ec

7
.gitignore vendored
View File

@ -44,4 +44,9 @@ target_wrapper.*
*.qmlproject.user.*
# QtCreator CMake
CMakeLists.txt.user*
CMakeLists.txt.user*
*.stash
*.plist
YACReaderLibrary/YACReaderLibrary\.xcodeproj/