Merge origin/master

Conflicts: src/main/webapp/dialogs/facette/addToFacetteDlg.xhtml src/main/webapp/edition.xhtml
miledrousset · Sep 22, 2016 · 34f999c · 34f999c
2 parents 7796465 + ed83a6f
commit 34f999c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-/nbproject/
+/nbproject/
+/target/