Merge branch 'master' of github.com:facebook/phabricator
be544e02982e
Actions

Authored by Chad Little <chad@chadsdomain.com> on Jan 16 2013, 06:34.

Description

Merge branch 'master' of github.com:facebook/phabricator

Conflicts:
src/__celerity_resource_map__.php

Committed

Chad Little <chad@chadsdomain.com>

Jan 16 2013, 06:34

Pushed

aubort

Jan 31 2017, 17:16

Parents

Branches

Unknown

Tags

Unknown

Chad Little <chad@chadsdomain.com> committed rPHbe544e02982e: Merge branch 'master' of github.com:facebook/phabricator (authored by Chad Little <chad@chadsdomain.com>).Jan 16 2013, 06:34

	Commit			Author	Details	Committed
	61057a9025f4			epriestley	Fix filetree collapse	Jan 16 2013
	f74c2bb13892			vrana	Optimize displaying info about lint messages	Jan 16 2013

				Path
	M			src/__celerity_resource_map__.php
	M			src/applications/diffusion/controller/DiffusionBrowseFileController.php
	M			webroot/rsrc/js/application/core/behavior-phabricator-nav.js