Merge branch 'master'

2016-09-22 21:59:51 +02:00
parent 5a3b3cddda 8f4d4962ce
commit 7c9a0ec459
1 changed files with 5 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,8 @@ nbproject
 #ignore local folder
 /local/
 #ignore config files from Visual Studio
 /.vs/
 /php_friendica.phpproj
 /php_friendica.sln