Merge branch 'master' into docFormat
This commit is contained in:
		
						commit
						9938bb95d9
					
				|  | @ -14,7 +14,7 @@ To generate a strong cookie secret use `python -c 'import os,base64; print base6 | ||||||
| 
 | 
 | ||||||
| ### Config File | ### Config File | ||||||
| 
 | 
 | ||||||
| An example [oauth2_proxy.cfg](contrib/oauth2_proxy.cfg.example) config file is in the contrib directory. It can be used by specifying `-config=/etc/oauth2_proxy.cfg` | An example [oauth2_proxy.cfg](https://github.com/pusher/oauth2_proxy/blob/master/contrib/oauth2_proxy.cfg.example) config file is in the contrib directory. It can be used by specifying `-config=/etc/oauth2_proxy.cfg` | ||||||
| 
 | 
 | ||||||
| ### Command Line Options | ### Command Line Options | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue