Merge branch 'master' into REL1_23
Also update tests to work with 1.23.
Conflicts:
googleAnalytics.i18n.php
Change-Id: I0c339ba0173a850b60e5ab51b9274e02678d5cf8
Merge branch 'master' into REL1_23
Tags None Referenced Files None Subscribers None
Description Merge branch 'master' into REL1_23 Also update tests to work with 1.23. Conflicts: Change-Id: I0c339ba0173a850b60e5ab51b9274e02678d5cf8
Details
Event TimelineLegoktm committed rEGAN44614d1b54b0: Merge branch 'master' into REL1_23 (authored by Davis Mosenkovs <davikovs@gmail.com>).Feb 3 2015, 8:08 PM2015-02-03 20:08:37 (UTC+0)
Merged Changes
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL |