~kissiel/checkbox/touch-logging

Viewing all changes in revision 3551.

  • Committer: Daniel Manrique
  • Author(s): Zygmunt Krynicki
  • Date: 2015-01-29 17:07:57 UTC
  • mfrom: (3543.3.1 launchpad/proxy)
  • Revision ID: daniel_manrique-20150129170757-uyadgm0t5bh1e2vz
"automatic merge of lp:~zkrynicki/checkbox/proxy/ by tarmac [r=sylvain-pineau][bug=][author=zkrynicki]"

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: