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

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

Browse source
This commit is contained in:
Matt C 2016-12-14 23:31:04 +00:00
commit c24cdf3bae
51 changed files with 1778 additions and 1663 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/static/stats.txt
View file

@ -1,5 +1,6 @@
203 source files
<<<<<<< HEAD
<<<<<<< HEAD
104401 lines
size
@ -14,6 +15,14 @@
95313 lines
3.5M size
>>>>>>> master
=======
104466 lines
4.0M size
136 JavaScript source files
95316 lines
3.4M size
>>>>>>> master
78 third party JavaScript source files
76377 lines
@ -21,12 +30,17 @@
58 first party JavaScript source files
<<<<<<< HEAD
<<<<<<< HEAD
18934 lines
729K size
=======
18936 lines
728K size
>>>>>>> master
=======
18939 lines
724K size
>>>>>>> master
3.2M uncompressed JavaScript size
1.7M compressed JavaScript size