Skip to content

Commit

Permalink
Merge branches ... into develop, as recommended by @jjvargass
Browse files Browse the repository at this point in the history
'dependabot/npm_and_yarn/y18n-3.2.2' #590,
'dependabot/npm_and_yarn/jspdf-2.3.1' #571,
'dependabot/npm_and_yarn/elliptic-6.5.4' #557,
'dependabot/npm_and_yarn/tinymce-5.6.0' #407 and
'dependabot/npm_and_yarn/axios-0.21.1' #406
  • Loading branch information
AlexFBP committed Apr 7, 2021
6 parents b13f876 + 9a6b139 + abbe546 + b2e51e7 + 132a544 + 84aba56 commit 3f28570
Show file tree
Hide file tree
Showing 4 changed files with 174 additions and 308 deletions.
2 changes: 1 addition & 1 deletion angular.json
Expand Up @@ -42,7 +42,7 @@
"scripts": [
"node_modules/pace-js/pace.min.js",
"node_modules/tinymce/tinymce.min.js",
"node_modules/tinymce/themes/modern/theme.min.js",
"node_modules/tinymce/themes/silver/theme.min.js",
"node_modules/tinymce/plugins/link/plugin.min.js",
"node_modules/tinymce/plugins/paste/plugin.min.js",
"node_modules/tinymce/plugins/table/plugin.min.js",
Expand Down

0 comments on commit 3f28570

Please sign in to comment.