Updates CHANGELOG after rebase

Author: gnikit

CHANGELOG.md

@@ -9,6 +9,31 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [2.5.0]
 
+### Fixed
+
+- Extension now activates for `FortranFixedForm`
+  ([#257](https://github.com/krvajal/vscode-fortran-support/issues/257))
+- Linting is now operational for `FortranFixedForm`
+  ([#258](https://github.com/krvajal/vscode-fortran-support/issues/258))
+
+### Changed
+
+- Renamed the Fixed Format Format language from `fortran_fixed-form` to
+  `FortranFixedForm`, an alias has been added for backwards compatibility
+  ([#259](https://github.com/krvajal/vscode-fortran-support/issues/259))
+
+### Added
+
+- Adds support for formatting with `findent` and `fprettify`
+  ([#29](https://github.com/krvajal/vscode-fortran-support/issues/29))
+- Adds prompts for installing Fortran IntelliSense and fortran-language-server
+
+### Removed
+
+- Removes `paths.js` for detecting binaries in favour of `which`
+
+## [2.4.0]
+
 ### Changed
 
 - Changes the syntax highlighting of preprocessor macros to match that of C++
@@ -273,7 +298,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Initial release
 
-[unreleased]: https://github.com/krvajal/vscode-fortran-support/compare/v2.4.0...HEAD
+[unreleased]: https://github.com/krvajal/vscode-fortran-support/compare/v2.5.0...HEAD
+[2.5.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.4.0...v2.5.0
 [2.4.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.3.0...v2.4.0
 [2.3.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.2.2...v2.3.0
 [2.2.2]: https://github.com/krvajal/vscode-fortran-support/compare/2.2.1...v2.2.1