server/.gitignore
Michael Gapczynski 05389827fd Merge branch 'master' into sharing
Conflicts:
	.gitignore
	lib/base.php
2011-07-04 16:36:30 -04:00

30 lines
266 B
Text

# the default generated dir + db file
data
owncloud
# just sane ignores
.*.sw[po]
*.bak
*.BAK
*~
*.orig
*.class
.cvsignore
Thumbs.db
*.py[co]
_darcs/*
CVS/*
.svn/*
RCS/*
# kdevelop
.kdev
*.kdev4
<<<<<<< HEAD
.project
=======
# Lokalize
*lokalize*
>>>>>>> master