4 Commits

Author	SHA1	Message	Date
Victor Woeltjen	9861e63589	[Code Style] Run fixstyle on merged changes	2016-05-20 13:09:16 -07:00
Victor Woeltjen	bce5643994	Merge branch 'master' into jscs-rebase-142 ... Conflicts: platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js platform/representation/src/MCTRepresentation.js	2016-05-20 13:07:58 -07:00
Henry	601bc03ba2	[New Edit Mode] #636 Modified EditAndCompose action to rely on a slightly refactored EditActionPolicy to remove folder specific logic	2016-05-20 10:42:17 -07:00
Henry	54a0de4a08	[New Edit Mode] #636 Removed edit concerns from DropGesture	2016-05-13 17:59:43 -07:00