summaryrefslogtreecommitdiff
path: root/avatar/.gitignore
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-08-03 16:04:54 -0700
committerEvan Prodromou <evan@status.net>2010-08-03 16:04:54 -0700
commit004e42e3e0606f0f9e5c8b6cd4512e5d870cd56e (patch)
treeab895f7609c8afeeadf3439c860b69d0cffcbb5e /avatar/.gitignore
parentd2234580357349a6887a2321e69d11de7bb29106 (diff)
parentfdd9aa58e3caf87096e1c1dcfa8b2f286b04e4b1 (diff)
Merge remote branch 'gitorious/1.0.x' into 1.0.x
Diffstat (limited to 'avatar/.gitignore')
-rwxr-xr-x[-rw-r--r--]avatar/.gitignore0
1 files changed, 0 insertions, 0 deletions
diff --git a/avatar/.gitignore b/avatar/.gitignore
index e69de29bb..e69de29bb 100644..100755
--- a/avatar/.gitignore
+++ b/avatar/.gitignore