diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-15 16:02:45 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-15 16:02:45 -0700 |
| commit | 472a824a1eaef00759ebbdc506384e8d521e408e (patch) | |
| tree | 1ec27204ee2df0bf2d049291b1c0a7b06e0a1dee /.gitignore | |
| parent | 2dce86d38e58c0fc88c252d0a7f0b1b83a960451 (diff) | |
| parent | 16df1c1ad4251db369a9b90889c12c186a2f12fb (diff) | |
| download | volse-hubzilla-472a824a1eaef00759ebbdc506384e8d521e408e.tar.gz volse-hubzilla-472a824a1eaef00759ebbdc506384e8d521e408e.tar.bz2 volse-hubzilla-472a824a1eaef00759ebbdc506384e8d521e408e.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
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 |