Sergey Sharybin 9453f29deb Merge branch 'master' into blender-tweaks ...

Conflicts:
	scripts/celerity_mapper.php
	src/__celerity_resource_map__.php
	src/applications/differential/controller/DifferentialDiffCreateController.php
	src/applications/diffusion/controller/DiffusionBrowseFileController.php
	src/applications/diffusion/controller/DiffusionRepositoryEditPolicyController.php
	src/applications/files/storage/PhabricatorFile.php
	src/applications/maniphest/controller/ManiphestTaskListController.php
	src/applications/project/controller/PhabricatorProjectController.php
	src/applications/project/controller/PhabricatorProjectProfileController.php
	src/applications/repository/storage/PhabricatorRepository.php
	webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js

2014-02-03 15:42:43 +06:00

..

install_rhel-derivs.sh

Use direct inclusion, not submodules, to bring Javelin into Phabricator

2013-01-22 12:43:55 -08:00

install_ubuntu.sh

Merge branch 'master' into blender-tweaks

2014-02-03 15:42:43 +06:00

update_phabricator.sh

Note where to stop/start php-fpm in upgrade example script

2013-12-30 16:47:05 -08:00