~vila/ols-tests-django/support-django-1.11

Viewing all changes in revision 26.

  • Committer: Vincent Ladeuil
  • Date: 2017-04-07 14:30:20 UTC
  • mfrom: (19.1.1 work)
  • Revision ID: vila+ols@canonical.com-20170407143020-iuwltsqg9kji0jt7
Merge trunk resolving conflicts.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: