Merge branch 'master' into redesign-2015
10ba64e892e2
Actions

Authored by epriestley <git@epriestley.com> on Jul 2 2015, 00:07.

Description

Merge branch 'master' into redesign-2015

Committed

epriestley <git@epriestley.com>

Jul 2 2015, 00:07

Pushed

aubort

Jan 31 2017, 17:16

Parents

Branches

Unknown

Tags

Unknown

epriestley <git@epriestley.com> committed rPH10ba64e892e2: Merge branch 'master' into redesign-2015 (authored by epriestley <git@epriestley.com>).Jul 2 2015, 00:07

	Commit			Author	Details	Committed
	6a996d76fd1a			epriestley	Remove "feed.public" and sort out feed policies	Jul 2 2015
	7f67bd8aff02			epriestley	Fix some pht-strings	Jul 1 2015

				Path
	M			src/__phutil_library_map__.php
	M			src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
	M			src/applications/calendar/storage/PhabricatorCalendarEventTransaction.php
	M			src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
	M			src/applications/feed/application/PhabricatorFeedApplication.php
	M			src/applications/feed/builder/PhabricatorFeedBuilder.php
	M			src/applications/feed/config/PhabricatorFeedConfigOptions.php
	D			src/applications/feed/controller/PhabricatorFeedPublicStreamController.php
	M			src/applications/feed/story/PhabricatorFeedStory.php