Merge github.com:Charles08/gallery3-contrib
Conflicts: 3.0/modules/user_info/module.info Signed-off-by: Charles Knowlton <neosmith@tuffmail.com>
This commit is contained in:
commit
aecbb273d3
@ -1,3 +1,7 @@
|
|||||||
name = "User Info"
|
name = "User Info"
|
||||||
description = "Login Information"
|
description = "Login Information"
|
||||||
|
<<<<<<< HEAD
|
||||||
version = 2
|
version = 2
|
||||||
|
=======
|
||||||
|
version = 1
|
||||||
|
>>>>>>> d537136570ba6c51df8b572901e395018d9ef629
|
||||||
|
Reference in New Issue
Block a user