mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-26 09:46: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-03 10:15:00 +00:00
commit 4101152c73
9 changed files with 125 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/static/stats.txt
View file

@ -1,3 +1,4 @@
<<<<<<< HEAD
202 source files
104241 lines
size
@ -5,14 +6,28 @@
136 JavaScript source files
95169 lines
3.5M size
=======
203 source files
104218 lines
4.0M size
136 JavaScript source files
95128 lines
3.4M size
>>>>>>> master
78 third party JavaScript source files
76377 lines
2.8M size
58 first party JavaScript source files
<<<<<<< HEAD
18792 lines
736K size
=======
18751 lines
724K size
>>>>>>> master
3.2M uncompressed JavaScript size
1.7M compressed JavaScript size