← Back to branch summary

~ubuntu-branches/ubuntu/vivid/phpldapadmin/vivid

Viewing all changes in revision 29.

  • Committer: Package Import Robot
  • Author(s): Andrew Mitchell
  • Date: 2012-02-28 00:09:09 UTC
  • mfrom: (1.1.10) (3.1.14 sid)
  • Revision ID: package-import@ubuntu.com-20120228000909-p7bjlnxihxajde58
Tags: 1.2.2-2ubuntu1
* Merge from Debian testing.  Remaining changes:
  - Merged call to dh_install to install debian/additional-templates/*
  - added groupOfNames.xml
  - Adds php_value memory_limit 32M to the apache.conf.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: