Files
gallery3/modules/gallery/views/in_place_edit.html.php
Tim Almdal e4d9ea3394 Merge branch 'master' of git@github.com:gallery/gallery3
Conflicts:
	modules/gallery/views/in_place_edit.html.php
2010-01-29 11:39:22 -08:00

556 B