jgaunt/CyberChef
2
0
Fork 0
mirror of https://github.com/gchq/CyberChef synced 2026-01-16 07:23:24 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/upstream/master'

Browse Source 
Conflicts:
	build/prod/cyberchef.htm
	build/prod/index.html
	build/prod/scripts.js
	src/static/stats.txt
This commit is contained in:
Matt C
2016-12-06 17:01:35 +00:00
parent b631feea74 e4d30861d5
commit 605a577d92
6 changed files with 66 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/static/stats.txt
View File

@@ -1,18 +1,32 @@
203 source files
<<<<<<< HEAD
104345 lines
size
136 JavaScript source files
95255 lines
3.5M size
=======
104221 lines
4.0M size
136 JavaScript source files
95131 lines
3.4M size
>>>>>>> master
78 third party JavaScript source files
76377 lines
2.8M size
58 first party JavaScript source files
<<<<<<< HEAD
18878 lines
740K size
=======
18754 lines
724K size
>>>>>>> master
3.2M uncompressed JavaScript size
1.7M compressed JavaScript size