diff options
| author | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
| commit | 1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f (patch) | |
| tree | 7a63ae1a434fae8cb51835fafd1b531d5f5da64e /docs/_data/core-team.yml | |
| parent | dbe47654160d389c6991a312c9cecd2eeb9b6122 (diff) | |
| parent | 22b79dae3c9307c329e6722ff1be8aa0a4143812 (diff) | |
| download | bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.tar.xz bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.zip | |
Merge branch 'master' into pr/15278
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_data/core-team.yml')
| -rw-r--r-- | docs/_data/core-team.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/_data/core-team.yml b/docs/_data/core-team.yml index b9e67f230..d1fd76320 100644 --- a/docs/_data/core-team.yml +++ b/docs/_data/core-team.yml @@ -21,3 +21,7 @@ - name: Heinrich Fenkart user: hnrch02 gravatar: 0d53f5d3d3d28bd470f394d98f7ef48f + +- name: Patrick H. Lauke + user: patrickhlauke + gravatar: 357f279672db832fc41a5a2f36559fcb |