-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into sharelatex
* upstream/master: (121 commits) Fix fetcher tests (#3583) Convert entry preview panel to JavaFX (#3574) Remove dependency for JUnit4 (#3580) Update tracis cache config as recommned by the docs (#3575) fix typo Show development information Release v4.1 Add new authors to mailMap (#3567) Fix build Really fix changelog Fix changelog Minor changes Disable the autocompletion as default (#3569) Add update exception for applicationinsights 2.0.0-BETA (#3571) Install4j jres 152 (#3570) Fix grammar mistake Downgrade applicationinsights. Fixes #3561 Adapt scripts/prepare-install4j.sh to JRE1.8.0_152 (#3568) ExportFormats: Use FileExtension enum (#3565) Update guava from 23.5-jre -> 23.6-jre ... # Conflicts: # build.gradle
- Loading branch information
Showing
114 changed files
with
2,414 additions
and
10,449 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.