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

..

builtin

Add an icon+background selector for project images

2013-10-17 09:32:34 -07:00

celerity

Merge branch 'master' into blender-tweaks

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

chatbot

Improve some documentation/examples for bot stuff

2013-02-14 12:47:39 -08:00

font

Made Meme Generator

2013-01-19 18:43:43 -08:00

sprite

Add app icons to quick menu

2014-01-31 15:19:39 -08:00

sql

Remove retry/failure mechanisms from MetaMTA

2014-02-01 14:35:42 -08:00

sshd

Fix two issues with shell/config scripts for hosted repositories

2013-12-04 16:45:54 -08:00