diff options
| author | Stefan Giehl <stefan@linux-me53.site> | 2013-02-06 12:09:08 +0400 |
|---|---|---|
| committer | Stefan Giehl <stefan@linux-me53.site> | 2013-02-06 12:09:08 +0400 |
| commit | e14fd739a38627ad298701472a95e560a25dc9a8 (patch) | |
| tree | e83827453b73ea660a7abc74de8c03c0f7a40edd /plugins/UserSettings/functions.php | |
| parent | 74ff8ea4d5af124f1c9502756ddf57a665d11883 (diff) | |
| parent | 84a2e9e92e909fa7d60abfde6c78e4f79ded4c6b (diff) | |
Merge branch 'master' of github.com:piwik/piwik
Conflicts:
.gitignore
Diffstat (limited to 'plugins/UserSettings/functions.php')
| -rw-r--r-- | plugins/UserSettings/functions.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php index f2070d6c73..790a61f939 100644 --- a/plugins/UserSettings/functions.php +++ b/plugins/UserSettings/functions.php @@ -4,7 +4,6 @@ * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * @version $Id$ * * @category Piwik_Plugins * @package Piwik_UserSettings |