diff options
author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-04-18 16:58:20 +0200 |
---|---|---|
committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-04-18 16:58:20 +0200 |
commit | ee1641393550eea9200f792707070e024879d466 (patch) | |
tree | ee9e19d380cdf4fee74d4b7c1fa323098c72b93b /.gitignore | |
parent | 62dbfffe399333cd4a792cc77256a2bcd689a14f (diff) | |
parent | 741a262f1b2d5c8f911896da32e80d543afb5cd1 (diff) | |
download | volse-hubzilla-ee1641393550eea9200f792707070e024879d466.tar.gz volse-hubzilla-ee1641393550eea9200f792707070e024879d466.tar.bz2 volse-hubzilla-ee1641393550eea9200f792707070e024879d466.zip |
Merge remote-tracking branch 'friendika-master/master'
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 837b2e876..9b3b23a00 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ include/jquery-1.4.2.min.js *.out *.version* push* +langup home.html |