aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-25 01:24:14 -0800
committerfriendica <info@friendica.com>2013-12-25 01:24:14 -0800
commit48f882c34b737205451a28da1238a38ec0d4af00 (patch)
tree7f042776087b7c80f90a86374dfe0cd592373cf9
parent5dee22c94d1ab366c88a7d3058867e70f5cfb827 (diff)
parent96d150bf2b1e2e90d73d1b70e79937fa070f439d (diff)
downloadvolse-hubzilla-48f882c34b737205451a28da1238a38ec0d4af00.tar.gz
volse-hubzilla-48f882c34b737205451a28da1238a38ec0d4af00.tar.bz2
volse-hubzilla-48f882c34b737205451a28da1238a38ec0d4af00.zip
Merge https://github.com/friendica/red into zpull
-rwxr-xr-x.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 77cc26aab..21f90f09a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ home.html
addon
*~
compiled/
+custom/
# patch attempts
*.orig