~mikemc/ubuntuone-control-panel/remote-folders-fix

Viewing all changes in revision 361.

  • Committer: mike.mccracken at canonical
  • Date: 2012-10-18 21:45:05 UTC
  • mfrom: (356.2.15 ubuntuone-control-panel)
  • Revision ID: mike.mccracken@canonical.com-20121018214505-jy46j6gxkku6ectv
merge with trunk and resolve conflict in controlpanel.py

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: