From a519df5d00da565e65054f795d51ec93f9f0575a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Dec 2014 01:43:20 +0100
Subject: [PATCH] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop

---
 htdocs/theme/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/theme/.gitignore b/htdocs/theme/.gitignore
index bad6db7e4d2..59c154b7d5f 100644
--- a/htdocs/theme/.gitignore
+++ b/htdocs/theme/.gitignore
@@ -1,2 +1,3 @@
 /bootstrap
 /oblyon
+/autre
-- 
GitLab