diff --git a/CHANGELOG.md b/CHANGELOG.md
index b19c25a2e59544f0c6a8d70a07765df52d2a8aa9..bb68a21e48573318cbe9cab2fcbfb76a1918f595 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [3.1.5] - 2020-05-18
+### Added
+- Support for other S3-compatible storage endpoint.
+- Line number when showing text files.
+
+### Fixed
+- S3 driver file streaming not working properly.
+
 ## [3.1.4] - 2020-04-13
 ### Changed
 - Now the migrate command resync the system quota for each user.
diff --git a/Gruntfile.js b/Gruntfile.js
index 08583ccd30ab99fcfb4a89b6b99659db5bf64250..d192ab7995d7cea486fc9f94b7f6e83d0f64d586 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -94,6 +94,11 @@ module.exports = function (grunt) {
                         cwd: 'node_modules/highlightjs',
                         src: ['styles/**/*', 'highlight.pack.min.js'],
                         dest: 'static/highlightjs'
+                    },                    {
+                        expand: true,
+                        cwd: 'node_modules/highlightjs-line-numbers.js/dist',
+                        src: ['highlightjs-line-numbers.min.js'],
+                        dest: 'static/highlightjs'
                     },
                     {
                         expand: true,
diff --git a/docs/changelog.md b/docs/changelog.md
index 8dae226a56dcdc6fe22af08983e7462056123793..b777be72a2f763f9a8f35e8bb9ad77bd197d07e7 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -8,6 +8,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [3.1.5] - WIP
+### Added
+- Support for other S3-compatible storage endpoint.
+- Line number when showing text files.
+
+### Fixed
+- S3 driver file streaming not working properly.
+
 ## [3.1.4] - 2020-04-13
 ### Changed
 - Now the migrate command resync the system quota for each user.
diff --git a/docs/sponsor.md b/docs/sponsor.md
index 060e6bca094898bbe24bd8027cecca722c778002..c7842490b270a5b19ac37dabc51bfcf588d3295a 100644
--- a/docs/sponsor.md
+++ b/docs/sponsor.md
@@ -19,4 +19,5 @@ All those who make the recurring donations, the names or logos will be inserted
 
 ## Sponsors
 
-+ [@philw95](https://github.com/philw95)
\ No newline at end of file
++ [@philw95](https://github.com/philw95)
++ [@iamernie](https://github.com/iamernie)
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 55c8099f3b9e5a9cf171e9bcf7f8f51e20fbf708..5f69af8c5a72bd52d5eaa134919dd88d6cf9379b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -867,6 +867,11 @@
       "resolved": "https://registry.npmjs.org/highlightjs/-/highlightjs-9.16.2.tgz",
       "integrity": "sha512-FK1vmMj8BbEipEy8DLIvp71t5UsC7n2D6En/UfM/91PCwmOpj6f2iu0Y0coRC62KSRHHC+dquM2xMULV/X7NFg=="
     },
+    "highlightjs-line-numbers.js": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/highlightjs-line-numbers.js/-/highlightjs-line-numbers.js-2.7.0.tgz",
+      "integrity": "sha512-2kgZkfGy3TB6rF1o1XJtUThDyraLAFd6iiAIE1MEH89om8VwyHsal6BBnIOP2yOuq2TCuuGd0YD6aGHa6iq3/g=="
+    },
     "hooker": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
diff --git a/package.json b/package.json
index 748d85a820e37af8b7d99b0d0944882b0e11cd4f..839c38c408f62a0cf8311aba204c68841843cc9b 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
     "clipboard": "^2.0.6",
     "dropzone": "^5.7.0",
     "highlightjs": "^9.16.2",
+    "highlightjs-line-numbers.js": "^2.7.0",
     "jquery": "^3.5.0",
     "plyr": "^3.5.10",
     "popper.js": "^1.16.1",
diff --git a/resources/templates/base.twig b/resources/templates/base.twig
index 6e5564faad29d9fc284564371745dc721e80ddaf..b0ba45d52fc474c6210fb1eee700ed355fca6238 100644
--- a/resources/templates/base.twig
+++ b/resources/templates/base.twig
@@ -47,12 +47,18 @@
 <script src="{{ asset('/static/jquery/jquery.min.js') }}"></script>
 <script src="{{ asset('/static/bootstrap/js/bootstrap.bundle.min.js') }}"></script>
 <script src="{{ asset('/static/highlightjs/highlight.pack.min.js') }}"></script>
+<script src="{{ asset('/static/highlightjs/highlightjs-line-numbers.min.js') }}"></script>
 <script src="{{ asset('/static/clipboardjs/clipboard.min.js') }}"></script>
 <script src="{{ asset('/static/plyr/plyr.min.js') }}"></script>
 <script src="{{ asset('/static/dropzone/dropzone.min.js') }}"></script>
 <script src="{{ asset('/static/bootstrap/js/bootstrap4-toggle.min.js') }}"></script>
 <script src="{{ asset('/static/app/app.js') }}"></script>
-<script>hljs.initHighlightingOnLoad();</script>
+<script>
+    hljs.initHighlightingOnLoad();
+    hljs.initLineNumbersOnLoad({
+        singleLine: true
+    });
+</script>
 {% block js %}{% endblock %}
 </body>
 </html>
\ No newline at end of file
diff --git a/src/css/app.css b/src/css/app.css
index 654905e0f6fafb8ff30807512dd15d8cb1a18404..e379c8d23124f387a7f3c91cbd08a2bf1875d188 100644
--- a/src/css/app.css
+++ b/src/css/app.css
@@ -204,4 +204,23 @@ body {
 
 .tag-add {
     overflow: hidden;
+}
+
+.hljs-ln-numbers {
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+
+    text-align: center;
+    color: #7d7d7d;
+    border-right: 1px solid #4b4b4b;
+    vertical-align: top;
+    padding-right: 5px !important;
+}
+
+.hljs-ln-code {
+    padding-left: 5px !important;
 }
\ No newline at end of file