aboutsummaryrefslogtreecommitdiff
path: root/docs/_data
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-01-14 18:02:18 -0800
committerMark Otto <[email protected]>2015-01-14 18:02:18 -0800
commit0531d6476cc655fe7fce56356067512b75ce7a15 (patch)
tree29ca60bd3edef23ea24e80f3d9bd526ecb01848c /docs/_data
parent720d02c5e5fc435bb2145bfbbb17878a536d1efb (diff)
parente94a597685e52d335747e61f3286abae3f6a5694 (diff)
downloadbootstrap-0531d6476cc655fe7fce56356067512b75ce7a15.tar.xz
bootstrap-0531d6476cc655fe7fce56356067512b75ce7a15.zip
Merge pull request #63 from twbs/team-unity
Core & Sass Teams are now one and the same bigger Team
Diffstat (limited to 'docs/_data')
-rw-r--r--docs/_data/core-team.yml8
-rw-r--r--docs/_data/sass-team.yml7
2 files changed, 8 insertions, 7 deletions
diff --git a/docs/_data/core-team.yml b/docs/_data/core-team.yml
index d1fd76320..2b3fd9ac6 100644
--- a/docs/_data/core-team.yml
+++ b/docs/_data/core-team.yml
@@ -25,3 +25,11 @@
- name: Patrick H. Lauke
user: patrickhlauke
gravatar: 357f279672db832fc41a5a2f36559fcb
+
+- name: Thomas McDonald
+ user: thomas-mcdonald
+ gravatar: 24cd55ab1a62ffb113ab8c02f64c9301
+
+- name: Gleb Mazovetskiy
+ user: glebm
+ gravatar: 729f685b8e8d7e9feed18c177c82e59b
diff --git a/docs/_data/sass-team.yml b/docs/_data/sass-team.yml
deleted file mode 100644
index 9918e23ce..000000000
--- a/docs/_data/sass-team.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- name: Thomas McDonald
- user: thomas-mcdonald
- gravatar: 24cd55ab1a62ffb113ab8c02f64c9301
-
-- name: Gleb Mazovetskiy
- user: glebm
- gravatar: 729f685b8e8d7e9feed18c177c82e59b