aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-10-11 05:34:11 -0700
committerhabeascodice <habeascodice@federated.social>2014-10-11 05:34:11 -0700
commitbde8c6d39e1ccf7a53569cc652a62b5447d3243f (patch)
tree598928300196120d90a28aac79e57d213dd61779 /.gitignore
parent7a106cf60cfa005ec6d8c35f922dc57b9af0175e (diff)
parent3d0d36b2bc6d134e1140b9fc8c40206be5bd7d2d (diff)
downloadvolse-hubzilla-bde8c6d39e1ccf7a53569cc652a62b5447d3243f.tar.gz
volse-hubzilla-bde8c6d39e1ccf7a53569cc652a62b5447d3243f.tar.bz2
volse-hubzilla-bde8c6d39e1ccf7a53569cc652a62b5447d3243f.zip
Merge remote branch 'upstream/master'
Diffstat (limited to '.gitignore')
-rwxr-xr-x.gitignore3
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