Skip to content
Permalink
Browse files

Merge origin/master

Conflicts:
	src/main/webapp/dialogs/facette/addToFacetteDlg.xhtml
	src/main/webapp/edition.xhtml
  • Loading branch information...
antonio.perez
antonio.perez committed Sep 22, 2016
2 parents 7796465 + ed83a6f commit 34f999c2072caaee9233eb240045a11c04b86d6f
Showing with 2 additions and 1 deletion.
  1. +2 −1 .gitignore
@@ -1 +1,2 @@
/nbproject/
/nbproject/
/target/

0 comments on commit 34f999c

Please sign in to comment.
You can’t perform that action at this time.