Files

Merge proposals dependent on lp://qastaging/~jeremywootten/pantheon-files/fix-context-menu-when-admin

  1. fix-context-menu-when-admin
  2. Dependent merge proposals

lp://qastaging/~jeremywootten/pantheon-files/fix-context-menu-when-admin has no merge proposals.