diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-09 20:47:29 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-09 20:47:29 -0700 |
| commit | 328ed8bb1b5f73626a032091a78609aea312f5ae (patch) | |
| tree | 1cb3dc14a29e42ce31ef9c4733b085dd7d410181 /.gitignore | |
| parent | 1b0b847fc80827022c513a74a7fa817c7d640da0 (diff) | |
| parent | c78227292709f8f36206c7234dbf3548e476d442 (diff) | |
| download | volse-hubzilla-328ed8bb1b5f73626a032091a78609aea312f5ae.tar.gz volse-hubzilla-328ed8bb1b5f73626a032091a78609aea312f5ae.tar.bz2 volse-hubzilla-328ed8bb1b5f73626a032091a78609aea312f5ae.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index df7ca3549..a12143ef5 100755 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,9 @@ compiled/ custom/ /store/ +# site apps +apps/ + # patch attempts *.orig *.rej |