diff options
| author | Friendika <info@friendika.com> | 2011-06-23 16:10:36 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-06-23 16:10:36 -0700 |
| commit | 2bc4e24da22d7a75bbdbae18e0c64575ff7fe858 (patch) | |
| tree | 31563e7867e0cc24462915d1bd909f620b55da5c | |
| parent | 8242fb4bf0215a96de2633d7f8492644fbca3f9c (diff) | |
| download | volse-hubzilla-2bc4e24da22d7a75bbdbae18e0c64575ff7fe858.tar.gz volse-hubzilla-2bc4e24da22d7a75bbdbae18e0c64575ff7fe858.tar.bz2 volse-hubzilla-2bc4e24da22d7a75bbdbae18e0c64575ff7fe858.zip | |
ignore local merge script
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 9b3b23a00..bb8f88f75 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ include/jquery-1.4.2.min.js *.version* push* langup +merge home.html |