diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-03-16 09:46:09 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-03-16 09:46:09 +0100 |
commit | 4c2bdc9dc021418563040929fbd0363e08591f9f (patch) | |
tree | 64d832524131b7a40d83baf5770e29fe2942d8e0 /.gitignore | |
parent | a73ea134cd09af039e01e4f6ae7f455ecb76279e (diff) | |
parent | 16df1c1ad4251db369a9b90889c12c186a2f12fb (diff) | |
download | volse-hubzilla-4c2bdc9dc021418563040929fbd0363e08591f9f.tar.gz volse-hubzilla-4c2bdc9dc021418563040929fbd0363e08591f9f.tar.bz2 volse-hubzilla-4c2bdc9dc021418563040929fbd0363e08591f9f.zip |
Merge branch 'dev' into bs4
Diffstat (limited to '.gitignore')
-rwxr-xr-x | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 039a8f530..050902f17 100755 --- a/.gitignore +++ b/.gitignore @@ -44,7 +44,8 @@ doc/html/ .zotshrc # external repositories for themes/addons extend/ - +# files generated by phpunit +tests/results/ ## exclude IDE files # config files and folders from Eclipse |