Merge branch 'advanced-search'

This commit is contained in:
Bachir Soussi Chiadmi
2018-01-02 12:13:16 +01:00
6 changed files with 28 additions and 8 deletions
@@ -1,4 +1,8 @@
<<<<<<< HEAD
name = Materio Personal Notes
=======
name = Materio Personal Notes Module
>>>>>>> advanced-search
description = "Materio per user notes on node module"
; Core version (required)