diff options
| author | sgiehl <stefan@piwik.org> | 2014-11-04 21:25:17 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2014-11-04 21:25:17 +0300 |
| commit | 15853aafa054bd2ea6cc41b1d9275f06a0dc14c9 (patch) | |
| tree | 03ba4469e554f3e6e7c9d25feae0561c8d47263c /plugins/DevicesDetection | |
| parent | 0c97fc87a77f94426d0dc72d871fb5c3eca666d1 (diff) | |
| parent | 5be8b023adc77c2290ba2be4364c20f3f2204c3b (diff) | |
Merge branch 'master' into deprecate_usersettings
Conflicts:
LEGALNOTICE
Diffstat (limited to 'plugins/DevicesDetection')
0 files changed, 0 insertions, 0 deletions