keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ignore local merge script

Browse source
This commit is contained in:
Friendika 2011-06-23 16:10:36 -07:00
parent 8242fb4bf0
commit 2bc4e24da2
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -8,4 +8,5 @@ include/jquery-1.4.2.min.js
*.version* *.version*
push* push*
langup langup
merge
home.html home.html