diff options
| author | diosmosis <benaka@piwik.pro> | 2014-11-24 07:33:33 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2014-11-24 07:33:33 +0300 |
| commit | cb64e7beadfaf5bef745457da6667aaa10136185 (patch) | |
| tree | 6e1d6d9fc9662d2cf0ebac9678581b1012fed67d /plugins/Actions/Reports | |
| parent | 09212d501398efd110a40eb18cd815b745297320 (diff) | |
| parent | a8917239df8ef46312c5295f8a92070f87125f86 (diff) | |
Merge branch 'master' into processed_metrics_metadata
Conflicts:
plugins/Actions/Reports/Base.php
Diffstat (limited to 'plugins/Actions/Reports')
| -rw-r--r-- | plugins/Actions/Reports/Base.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/Actions/Reports/Base.php b/plugins/Actions/Reports/Base.php index 84870baba8..08d5ac6f69 100644 --- a/plugins/Actions/Reports/Base.php +++ b/plugins/Actions/Reports/Base.php @@ -103,4 +103,4 @@ abstract class Base extends \Piwik\Plugin\Report }; } } -}
\ No newline at end of file +} |