1
0
This repository has been archived on 2021-04-26. You can view files and clone it, but cannot push or open issues or pull requests.
gallery3-contrib/3.0
rWatcher d5728284c8 Merge remote branch 'gallery3-contrib/master'
Conflicts:
	3.0/modules/albumpassword/controllers/albumpassword.php
	3.0/modules/albumpassword/helpers/MY_item.php
	3.0/modules/albumpassword/views/assignpassword.html.php
	3.0/modules/albumpassword/views/loginpassword.html.php
	3.1/modules/albumpassword/controllers/albumpassword.php
	3.1/modules/albumpassword/helpers/MY_item.php
	3.1/modules/albumpassword/views/assignpassword.html.php
	3.1/modules/albumpassword/views/loginpassword.html.php
2010-11-01 01:30:19 -04:00
..
client Move all modules/themes/client code for the 3.0 codebase into a 3.0 directory. 2010-10-08 12:51:32 -07:00
modules Merge remote branch 'gallery3-contrib/master' 2010-11-01 01:30:19 -04:00
obsolete/web_client Move all modules/themes/client code for the 3.0 codebase into a 3.0 directory. 2010-10-08 12:51:32 -07:00
themes Move all modules/themes/client code for the 3.0 codebase into a 3.0 directory. 2010-10-08 12:51:32 -07:00