← Back to branch summary

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

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

Viewing all changes in revision 81.

Committer: Victor Thompson
Date: 2015-08-07 00:12:11 UTC
mfrom: (79.1.2 ubuntu-weather-app)
Revision ID: victor.thompson@gmail.com-20150807001211-03jtl93e7l8mojhk

Merge trunk/reboot and resolve conflicts

files added:
tests/autopilot/ubuntu_weather_app/tests/test_add_location_page.py

files modified:
app/ui/AddLocationPage.qml

app/ui/LocationsPage.qml

debian/changelog

po/com.ubuntu.weather.pot

po/de.po

po/en_GB.po

po/fr.po

po/gl.po

po/hu.po

po/pl.po

po/pt.po

po/ru.po

po/sv.po

po/zh_TW.po

tests/autopilot/ubuntu_weather_app/__init__.py

tests/autopilot/ubuntu_weather_app/tests/test_empty_state.py

Show diffs side-by-side

added added

removed removed

app/ui/AddLocationPage.qml

app/ui/LocationsPage.qml

debian/changelog

po/com.ubuntu.weather.pot

tests/autopilot/ubuntu_weather_app/__init__.py

tests/autopilot/ubuntu_weather_app/tests/test_add_location_page.py

tests/autopilot/ubuntu_weather_app/tests/test_empty_state.py

Older »