~gerlowskija/ubuntu-calendar-app/fix-for-bug1350605

Viewing all changes in revision 409.

  • Committer: Jason
  • Date: 2014-08-22 22:11:59 UTC
  • mfrom: (401.1.11 trunk)
  • Revision ID: gerlowskija@gmail.com-20140822221159-a23pwg0vhc7cste1
Fix merge conflicts with trunk.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: