~telepathy-kde/telepathy-kde/ktp-auth-handler

Viewing all changes in revision 137.

  • Committer: Aleix Pol
  • Date: 2014-11-13 12:36:32 UTC
  • mfrom: (132.1.28 trunk)
  • Revision ID: aleixpol@kde.org-20141113123632-3s6yi5hu0fu001du
Merge branch 'frameworks'

Conflicts:
        x-telepathy-password-prompt.ui

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: