Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-17 07:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge rules.

Browse source
This commit is contained in:
Lauri Ojansivu 2018-09-16 00:44:41 +03:00
parent 6ab5f093d5
commit b3a752ef34
6 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/lib/utils.js
View file

@ -145,7 +145,6 @@ Utils = {
});
},
<<<<<<< HEAD
setMatomo(data){
window._paq = window._paq || [];
window._paq.push(['setDoNotTrack', data.doNotTrack]);