Merge branch 'origin-master' into origin-dev#32070_novelty_by_items_with_thesaurus
Conflicts: library/Class/Notice.php
Branches
Tags
Showing
- .gitattributes 3 additions, 6487 deletions.gitattributes
- .gitlab-ci.yml 13 additions, 0 deletions.gitlab-ci.yml
- .htaccess 1 addition, 1 deletion.htaccess
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- CONTRIBUTING.md 1 addition, 0 deletionsCONTRIBUTING.md
- LICENSE 1 addition, 0 deletionsLICENSE
- VERSIONS 207 additions, 0 deletionsVERSIONS
- VERSIONS_HOTLINE/47256 1 addition, 0 deletionsVERSIONS_HOTLINE/47256
- VERSIONS_WIP/31718 1 addition, 0 deletionsVERSIONS_WIP/31718
- VERSIONS_WIP/37124 1 addition, 0 deletionsVERSIONS_WIP/37124
- VERSIONS_WIP/46014 1 addition, 0 deletionsVERSIONS_WIP/46014
- amber/afi/souvigny/booklet/jquery.booklet.1.2.0.css 99 additions, 99 deletionsamber/afi/souvigny/booklet/jquery.booklet.1.2.0.css
- amber/afi/souvigny/booklet/jquery.easing.1.3.js 38 additions, 38 deletionsamber/afi/souvigny/booklet/jquery.easing.1.3.js
- amber/src/examples/googlecharts/README.md 97 additions, 97 deletionsamber/src/examples/googlecharts/README.md
- amber/src/examples/googlecharts/js/GoogleCharts.deploy.js 55 additions, 55 deletionsamber/src/examples/googlecharts/js/GoogleCharts.deploy.js
- amber/src/examples/googlecharts/js/GoogleCharts.js 55 additions, 55 deletionsamber/src/examples/googlecharts/js/GoogleCharts.js
- amber/src/examples/googlecharts/js/GoogleChartsExamples.deploy.js 5 additions, 5 deletions...c/examples/googlecharts/js/GoogleChartsExamples.deploy.js
- amber/src/examples/googlecharts/js/GoogleChartsExamples.js 5 additions, 5 deletionsamber/src/examples/googlecharts/js/GoogleChartsExamples.js
- amber/src/examples/googlecharts/popcharts.html 29 additions, 29 deletionsamber/src/examples/googlecharts/popcharts.html
- amber/src/examples/presentation/fosdem2012/lib/booklet/jquery.booklet.1.2.0.css 99 additions, 99 deletions...sentation/fosdem2012/lib/booklet/jquery.booklet.1.2.0.css
Please register or sign in to comment