Fix some bad merging; I landed an old branch for D5502.
7b52dd767caa
Actions

Authored by epriestley <git@epriestley.com> on Apr 1 2013, 00:19.

Description

Fix some bad merging; I landed an old branch for D5502.

Auditors: btrahan

Committed

epriestley <git@epriestley.com>

Apr 1 2013, 21:50

Pushed

aubort

Jan 31 2017, 17:16

Parents

Branches

Unknown

Tags

Unknown

				Path
	M			src/__celerity_resource_map__.php
	M			src/applications/conpherence/controller/ConpherenceController.php
	M			webroot/rsrc/js/application/conpherence/behavior-menu.js