submodules
submodules
Switched from reading raw config values to PrivacyManager::getPurgeDataSettings() so if PiwikOption holds different configuration than config file it, proper values are taken to calculations
Merge remote-tracking branch 'origin/master'
Refs #4510 Revert as it's causing visual bugs (some widget content now overflowing)
Rename annotations icons + adding two missing icons refs #4457
Adding icons refs #4457
Refs #4502 Fix bug in segment editor when editing as a view/admin user.
Fixes #4562 we removed 3 log tables recently
Always delete phone numbers from reports
Fix hindi name
New beta with bug fixes needed
Merge pull request #206 from clearcode/addedMissingOptionCheckToInvalidateArchivedReports

Switched from reading raw config values to reusing the helper method, fixes #4568
Merge remote-tracking branch 'origin/master' into multi_superuser

Conflicts:
	plugins/CustomAlerts
	plugins/SegmentEditor/API.php