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

Description

Merge branch 'master' into redesign-2015

Details

Provenance

Parents

Branches

Tags

Merged Changes

Changes (9)

Path

Size

src/

applications/

calendar/

controller/

storage/

config/

check/

feed/

application/

builder/

config/

controller/

story/

rP10ba64e892e2

src/__phutil_library_map__.php

src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php

src/applications/calendar/storage/PhabricatorCalendarEventTransaction.php

src/applications/config/check/PhabricatorExtraConfigSetupCheck.php

src/applications/feed/application/PhabricatorFeedApplication.php

src/applications/feed/builder/PhabricatorFeedBuilder.php

src/applications/feed/config/PhabricatorFeedConfigOptions.php

src/applications/feed/controller/PhabricatorFeedPublicStreamController.php

src/applications/feed/story/PhabricatorFeedStory.php

Merge branch 'master' into redesign-201510ba64e892e2Actions