diff options
author | zotlabs <mike@macgirvin.com> | 2017-11-08 19:21:20 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-11-08 19:21:20 -0800 |
commit | 75471ba10ff0c9ca3dfdc943c6647fc6ab1332f8 (patch) | |
tree | cf4cc209bec0eb22bafacaa75cdf613a76f42b72 /.gitignore | |
parent | 5e47b767ea6ed92f6f7ea0a3368762827937a5d8 (diff) | |
parent | e7d20efb1b8d579bcb9bdef99205aad19281f6b2 (diff) | |
download | volse-hubzilla-75471ba10ff0c9ca3dfdc943c6647fc6ab1332f8.tar.gz volse-hubzilla-75471ba10ff0c9ca3dfdc943c6647fc6ab1332f8.tar.bz2 volse-hubzilla-75471ba10ff0c9ca3dfdc943c6647fc6ab1332f8.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 0e5233eaf..b001b6b27 100755 --- a/.gitignore +++ b/.gitignore @@ -19,10 +19,11 @@ Thumbs.db -## Ignore RedMatrix site specific files and folders +## Ignore site specific files and folders .htconfig.php favicon.* addon/ +widget/ custom/ /store/ # site apps |