diff options
| author | sgiehl <stefan@piwik.org> | 2016-09-01 12:03:47 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2016-09-01 12:37:37 +0300 |
| commit | fa2ea69a59f579a860ad1dd2d4c54e1ae8cc3391 (patch) | |
| tree | 6030f0ec76c29df0b1bdc24dbb92703e66c74690 /plugins/CustomVariables | |
| parent | 2d57ea30192fadf305a962277f19ca8b2cf32ea0 (diff) | |
| parent | 739a236b360181a3a5e5c7db379abeef7e72f75d (diff) | |
Merge branch 'master' into 3.0-m07
Diffstat (limited to 'plugins/CustomVariables')
4 files changed, 6 insertions, 0 deletions
diff --git a/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_link_in_menu.png b/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_link_in_menu.png new file mode 100644 index 0000000000..9c95f6ecbd --- /dev/null +++ b/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_link_in_menu.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55a85c4be2d07d26e776e5dfee75b290ab5431a2b09b64f95fd0c998aadae245 +size 6428 diff --git a/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_manage.png b/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_manage.png new file mode 100644 index 0000000000..50611654f2 --- /dev/null +++ b/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_manage.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c120eb5f33c2d515ab8f0f81c0f80c6a284e19bd285fc9b6cc5f0d7cdc42c18 +size 68494 diff --git a/plugins/CustomVariables/tests/UI/expected-ui-screenshots/CustomVariables_link_in_menu.png b/plugins/CustomVariables/tests/UI/expected-ui-screenshots/CustomVariables_link_in_menu.png Binary files differdeleted file mode 100644 index eb77f36985..0000000000 --- a/plugins/CustomVariables/tests/UI/expected-ui-screenshots/CustomVariables_link_in_menu.png +++ /dev/null diff --git a/plugins/CustomVariables/tests/UI/expected-ui-screenshots/CustomVariables_manage.png b/plugins/CustomVariables/tests/UI/expected-ui-screenshots/CustomVariables_manage.png Binary files differdeleted file mode 100644 index cc28bdaf04..0000000000 --- a/plugins/CustomVariables/tests/UI/expected-ui-screenshots/CustomVariables_manage.png +++ /dev/null |
