2 commits

Author	SHA1	Message	Date
rvelices	28093b24d2	merge -r1435 from branch-1_6 to trunk ... bug 450: "upload an image" link in menu bar is missing git-svn-id: http://piwigo.org/svn/trunk@1436 68402e56-0260-453c-a942-63ccdbb3a9ee	2006-07-06 02:45:26 +00:00
nikrou	a08cd1a583	svn merge -r1366:1371 from branch 1.6 into trunk ... git-svn-id: http://piwigo.org/svn/trunk@1377 68402e56-0260-453c-a942-63ccdbb3a9ee	2006-06-22 19:21:56 +00:00