Sergey Sharybin 91c07e9f99 Merge branch 'master' into blender-tweaks ...

Conflicts:
	resources/celerity/map.php
	src/applications/maniphest/controller/ManiphestTaskEditController.php

2014-07-22 13:33:45 +06:00

..

map.php

Merge branch 'master' into blender-tweaks

2014-07-22 13:33:45 +06:00

packages.php

Use standard tag elements instead of "maniphest project tag" to show tags in list views

2014-06-26 08:49:44 -07:00