-
Committer:
Daniel Holbach
-
Date:
2015-03-06 08:40:27 UTC
-
mfrom:
(71.1.10 moar-ceontent)
-
Revision ID:
daniel.holbach@canonical.com-20150306084027-tj3b9og794xokvu0
merge lp:~nskaggs/help-app/moar-ceontent - resolve conflicts in edit-here/po by unapplying changes and running generate-pot/generate-translations