mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-25 09:16:17 -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 20:23:20 +00:00
commit 22c00e8d3c
7 changed files with 56 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/static/stats.txt
View file

@ -1,18 +1,32 @@
<<<<<<< HEAD
202 source files
104399 lines
size
136 JavaScript source files
95309 lines
=======
203 source files
104274 lines
4.0M size
136 JavaScript source files
95184 lines
>>>>>>> master
3.5M size
78 third party JavaScript source files
76377 lines
2.8M size
2.7M size
58 first party JavaScript source files
<<<<<<< HEAD
18932 lines
740K size
=======
18807 lines
728K size
>>>>>>> master
3.2M uncompressed JavaScript size
1.7M compressed JavaScript size