public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Merge github.com:Charles08/gallery3-contrib

Browse Source 
Conflicts:
	3.0/modules/user_info/module.info

Signed-off-by: Charles Knowlton <neosmith@tuffmail.com>
This commit is contained in:
Charles Knowlton 2011-01-17 17:03:28 -06:00
commit aecbb273d3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3.0/modules/user_info/module.info
View File

@ -1,3 +1,7 @@
name = "User Info"
description = "Login Information"
<<<<<<< HEAD
version = 2
=======
version = 1
>>>>>>> d537136570ba6c51df8b572901e395018d9ef629