diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-15 16:09:08 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-15 16:09:08 -0700 |
| commit | c95e9b9ba52b8376eea079850caf178e223a1a6d (patch) | |
| tree | d9f60eec35a69652311d46a7dbf3d1bb44871442 /.gitignore | |
| parent | e1fe637dcd05f587a5974f5062fd4b2c31e109bb (diff) | |
| parent | 472a824a1eaef00759ebbdc506384e8d521e408e (diff) | |
| download | volse-hubzilla-c95e9b9ba52b8376eea079850caf178e223a1a6d.tar.gz volse-hubzilla-c95e9b9ba52b8376eea079850caf178e223a1a6d.tar.bz2 volse-hubzilla-c95e9b9ba52b8376eea079850caf178e223a1a6d.zip | |
could not fix the merge conflicts in composer.lock so it will need to be regenerated in the red tree.
also the autoload_classmap is a disgrace. We provide autoload functions so that we can dynamically
change the file tree without needing to regenerate a bunch of runtime stuff every time we add a file.
Merge branch 'dev' into red
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 |