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

..

controllers

Gracefully handle the case when the gallery2 instances moves somewhere

2009-06-23 17:09:37 -07:00

data

If there's a missing source image during import, swap in our "broken

2009-05-19 03:54:33 +00:00

helpers

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

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

models

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

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

views

More minor facelift for the admin/g2_import page.

2009-06-19 15:56:55 -07:00

module.info

Very early round of Gallery 2 import code. It can import users (with

2009-04-15 07:23:22 +00:00