From: Sem <sembrestels@riseup.net>
Date: Sun, 20 May 2012 00:39:46 +0000 (+0200)
Subject: Merge branch '1.8' of git://github.com/Elgg/Elgg into lorea-preprod
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=59bec8bc3e61e6ad537c1418e64094d0665470af;p=lorea%2Felgg.git

Merge branch '1.8' of git://github.com/Elgg/Elgg into lorea-preprod
---

59bec8bc3e61e6ad537c1418e64094d0665470af
diff --cc .gitignore
index bf64d4a49,c0bba2c6c..28bdb3e53
--- a/.gitignore
+++ b/.gitignore
@@@ -1,10 -1,9 +1,10 @@@
+ # ignore Elgg configuration
  /engine/settings.php
 +/engine/handlers/views_simplecache/*
  /.htaccess
- /.buildpath
- /.settings
- /.project
  /mod/*
+ 
+ # don't ignore bundled plugins
  !/mod/blog/
  !/mod/bookmarks/
  !/mod/categories/