Skip to content
  • Michka Popoff's avatar
    Merge branch homebrew/master into linuxbrew/master · 38e0dcea
    Michka Popoff authored
     Conflicts:
    	Formula/caf.rb
    	Formula/collectd.rb
    	Formula/gammu.rb
    	Formula/globus-toolkit.rb
    	Formula/libgcrypt.rb
    	Formula/libre.rb
    	Formula/libu2f-server.rb
    	Formula/ruby.rb
    	Formula/tcl-tk.rb
    	Formula/tcpdump.rb
    	Formula/thrift@0.9.rb
    	Formula/tinc.rb
    	Formula/ttyd.rb
    	Formula/zbackup.rb
    	README.md
    38e0dcea