Merge branch 'master'
This commit is contained in:
commit
7c9a0ec459
1 changed files with 5 additions and 0 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue