Merge branch 'master' of https://github.com/easysoft/zentaopms

Conflicts: module/task/css/create.css
2018-05-18 09:37:56 +08:00
parent 6c6601ae46 9ebca72c86
commit 2bc846055c
9 changed files with 19 additions and 14 deletions
@@ -1 +1,5 @@
+<<<<<<< HEAD
 #copyButton{width: 50px;}
+=======
+#copyButton {width: 56px; background-color: #f1f1f1; opacity: 1;} /*Adjust for task #4151;*/
+>>>>>>> 9ebca72c8626aefa35f2f966d11a3989fb2d6503