Merge branch 'master' of github.com:mikeage/gallery3-contrib

Browse Source

Conflicts:
	3.0/modules/editcaptured/helpers/editcaptured_theme.php
	3.0/modules/editcreation/helpers/editcreation_theme.php

...

This commit is contained in:

Mike Miller 2013-01-08 20:46:38 +02:00

parent c022a0af59 8115135e17

commit 78e63a474d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available