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

Browse source

* remotes/upstream/master:
  cut/paste error
  scheme checking for webservers without $_SERVER['HTTPS']

* master:

...

This commit is contained in:

Simon L'nu 2012-03-17 03:23:46 -04:00

parent 057a142b8c

commit c7759af8c5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available