diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-12-18 14:00:54 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-12-18 14:00:54 -0800 |
| commit | 2926ffbca0d7acdbdfdc06615976da3a7278f7ad (patch) | |
| tree | ec2647249355635a45611f9e4d5547d5c2fe765d /sites/www/contributing.rst | |
| parent | b3732cde6f2bea22fbbfd7ec6124489f61e502b7 (diff) | |
| parent | 3905dfb0a8f719b435125d404ca4403f9849e17c (diff) | |
Merge branch '1.13' into 1.14
Conflicts:
sites/www/changelog.rst
Diffstat (limited to 'sites/www/contributing.rst')
0 files changed, 0 insertions, 0 deletions