← Back to branch summary

~vthompson/ubuntu-weather-app/fix-1521701

Viewing all changes in revision 189.

  • Committer: Victor Thompson
  • Date: 2015-12-23 00:44:54 UTC
  • mfrom: (187.2.1 reboot)
  • Revision ID: victor.thompson@gmail.com-20151223004454-wt998fph8hzfsocq
Merge of trunk and resolve conflict.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: