| commit | 9549f1beef17b24cfa776d60e64391393119b68b | [log] [tgz] |
|---|---|---|
| author | Sam Davis <sam.davis@tasktop.com> | Mon Jan 04 17:08:12 2016 -0800 |
| committer | Sam Davis <sam.davis@tasktop.com> | Mon Jan 04 17:08:12 2016 -0800 |
| tree | 77f4676e74a218a9b12636a5b5505e085d2bcd06 | |
| parent | cab3de3c466aaeab4577b9d1f17b0a16e7ebebd8 [diff] | |
| parent | d601f45d4c1a3ecd5794e937acbfb4033ad15c2b [diff] |
Merge branch 'master' into staging Conflicts: contributors/contributorupdate.php discovery/directory-3.14.xml discovery/directory-3.15.xml index.php new/new-3.14.html new/new.html updates.xml