diff options
| author | diosmosis <benaka@piwik.pro> | 2014-11-26 20:15:34 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2014-11-26 20:15:34 +0300 |
| commit | dd0212dbec9a0b636befffb76cef994358985575 (patch) | |
| tree | 15c97dfc93388b6c3e7ba495d2bafbcc0c01461d /core/Piwik.php | |
| parent | 2183e1c6fe35dbd42714985ba9be52137c843dcf (diff) | |
| parent | c23bff3e2ead46dd43533a6d54788c63fa14bced (diff) | |
Merge branch 'master' into processed_metrics_metadata
Conflicts:
tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
Diffstat (limited to 'core/Piwik.php')
| -rw-r--r-- | core/Piwik.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/Piwik.php b/core/Piwik.php index 81451af88e..bc5244dd52 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -481,6 +481,7 @@ class Piwik * in case another Login plugin is being used. * * @return string + * @api */ public static function getLoginPluginName() { |