mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-24 08:46:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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:02:17 +00:00
commit 44919b8c17
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
104269 lines
size
136 JavaScript source files
95179 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
18802 lines
736K size
=======
18754 lines
724K size
>>>>>>> master
3.1M uncompressed JavaScript size
1.7M compressed JavaScript size