Permalink
Browse files

Merge branch 'master' of https://github.com/arambalakjian/DataObjects…

…-as-Pages

Conflicts:
	code/DataObjects/DataObjectAsPage.php
  • Loading branch information...
2 parents 4da1194 + 363f4dc commit c95ed0a86c0348e27318fa49667a3bfba4e6265e Aram committed Jan 24, 2012
Showing with 0 additions and 0 deletions.

0 comments on commit c95ed0a

Please sign in to comment.