Merge branch 'quick-timer' of https://github.com/oleid/gnome-shell-teatime into quick-timer

Browse Source

Conflicts:
	po/TeaTime.pot
	po/de.po
	src/extension.js

...

This commit is contained in:

Olaf Leidinger 2013-11-03 18:28:09 +01:00

parent ce86ef76b6 2af944a2a3

commit dad8aa2733

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available