~jeremywootten/pantheon-files/fix-context-menu-when-admin

Viewing all changes in revision 2204.

  • Committer: Jeremy Wootten
  • Date: 2016-12-03 12:28:18 UTC
  • mfrom: (2200.1.190 pantheon-files)
  • Revision ID: jeremy@elementaryos.org-20161203122818-3t1j2r6m6d0ir74v
Merge trunk to r2390 and resolve conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: