Merge branch 'master'

This commit is contained in:
gerhard6380 2016-09-22 21:59:51 +02:00
commit 7c9a0ec459

5
.gitignore vendored
View file

@ -42,3 +42,8 @@ nbproject
#ignore local folder #ignore local folder
/local/ /local/
#ignore config files from Visual Studio
/.vs/
/php_friendica.phpproj
/php_friendica.sln