From: rsoulliere <robert.soulliere@mohawkcollege.ca> Date: Thu, 6 Oct 2011 18:19:47 +0000 (-0400) Subject: Merge branch 'github_2_1' into rel_2_1 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=363a7c572e3b0bdec3c81cc437748aab8344661c;p=evergreen%2Ftadl.git Merge branch 'github_2_1' into rel_2_1 Conflicts: 1.6/integration/intro.xml admin/admin-intro.xml appendices/about_this_documentation.xml appendices/bookindex.xml appendices/glossary.xml appendices/more_info.xml appendices/permissions.xml appendices/schema.xml development/development_intro.xml intro/about_evergreen.xml intro/intro_intro.xml intro/releasenotes.xml media/evergreen_logo.gif opac/opac_intro.xml reports/report-intro.xml stafftasks/README stafftasks/stafftasks_intro.xml --- 363a7c572e3b0bdec3c81cc437748aab8344661c diff --cc reports/README index 0000000000,0000000000..e69de29bb2 new file mode 100644 --- /dev/null +++ b/reports/README