Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/purplespider/silverstripe…
Browse files Browse the repository at this point in the history 
…-basic-galleries

Conflicts:
	code/PhotoGalleryPage.php
  • Loading branch information
@purplespider
purplespider committed Aug 13, 2014
2 parents b8c0f3c + e036146 commit 21bab17
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 21bab17

Please sign in to comment.