Tim Almdal 72ebc2fb34 Merge branch 'master' of git@github.com:gallery/gallery3 ...

Conflicts:
	modules/g2_import/helpers/g2_import.php

2009-07-07 12:17:38 -07:00

..

g2_import_event.php

Gee it's May already. Update copyright to 2009.

2009-05-13 20:04:58 +00:00

g2_import_installer.php

Refactor the install/upgrade code to be more flexible.

2009-06-23 12:00:49 -07:00

g2_import_menu.php

Gee it's May already. Update copyright to 2009.

2009-05-13 20:04:58 +00:00

g2_import_task.php

Fix for tickets #312 and #370. Added a task logging api. Changed g2_import

2009-07-06 20:05:35 -07:00

g2_import.php

Merge branch 'master' of git@github.com:gallery/gallery3

2009-07-07 12:17:38 -07:00