Merge pull request #41 from cash/embed-lightbox

author Cash Costello <cash.costello@gmail.com>

Sun, 26 Jun 2011 13:24:46 +0000 (06:24 -0700)

committer Cash Costello <cash.costello@gmail.com>

Sun, 26 Jun 2011 13:24:46 +0000 (06:24 -0700)
author Cash Costello <cash.costello@gmail.com>
Sun, 26 Jun 2011 13:24:46 +0000 (06:24 -0700)
committer Cash Costello <cash.costello@gmail.com>
Sun, 26 Jun 2011 13:24:46 +0000 (06:24 -0700)
diff --cc mod/file/actions/file/upload.php
Simple merge
diff --cc mod/file/views/default/forms/file/upload.php
Simple merge
diff --cc views/default/css/elements/layout.php
Simple merge
diff --cc views/default/css/elements/navigation.php
Simple merge
author	Cash Costello <cash.costello@gmail.com>
	Sun, 26 Jun 2011 13:24:46 +0000 (06:24 -0700)
committer	Cash Costello <cash.costello@gmail.com>
	Sun, 26 Jun 2011 13:24:46 +0000 (06:24 -0700)
		1	2
mod/file/actions/file/upload.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/file/views/default/forms/file/upload.php	patch \|	diff1 \|	diff2 \|	blob \| history
views/default/css/elements/layout.php	patch \|	diff1 \|	diff2 \|	blob \| history
views/default/css/elements/navigation.php	patch \|	diff1 \|	diff2 \|	blob \| history