Merge branch 'advanced-search'
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user