diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-11-07 12:20:11 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-11-07 12:20:11 +0100 |
commit | b5d4acf10a49980035f89d37440ae41a574df5a0 (patch) | |
tree | 8b1ee6b4c2f65d8dc4285e8925a5157773eefcbc /.gitignore | |
parent | 47fbdda40951be5109c739f63331e2bb95ebd64a (diff) | |
parent | 7b69dc574b1527fc0e16a0c2f91a726132987e2f (diff) | |
download | volse-hubzilla-b5d4acf10a49980035f89d37440ae41a574df5a0.tar.gz volse-hubzilla-b5d4acf10a49980035f89d37440ae41a574df5a0.tar.bz2 volse-hubzilla-b5d4acf10a49980035f89d37440ae41a574df5a0.zip |
Merge remote-tracking branch 'mike/master' into dev
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 |