Merge pull request #63 from twbs/team-unity

Core & Sass Teams are now one and the same bigger Team

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

docs/_data/sass-team.yml

@@ -1,7 +0,0 @@
-- name: Thomas McDonald
-  user: thomas-mcdonald
-  gravatar: 24cd55ab1a62ffb113ab8c02f64c9301
-
-- name: Gleb Mazovetskiy
-  user: glebm
-  gravatar: 729f685b8e8d7e9feed18c177c82e59b

docs/about/team.md

@@ -20,19 +20,3 @@ Bootstrap is maintained by the founding team and a small group of invaluable cor
 </div>
 
 Get involved with Bootstrap development by [opening an issue](https://github.com/twbs/bootstrap/issues/new) or submitting a pull request. Read our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) for information on how we develop.
-
-## Sass team
-
-<div class="list-group bs-team">
-  {% for member in site.data.sass-team %}
-    <div class="list-group-item">
-      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user={{ member.user }}&amp;type=follow"></iframe>
-      <a class="team-member" href="https://github.com/{{ member.user }}">
-        <img src="http://www.gravatar.com/avatar/{{ member.gravatar }}" alt="@{{ member.user }}" width="32" height="32">
-        <strong>{{ member.name }}</strong> <small>@{{ member.user }}</small>
-      </a>
-    </div>
-  {% endfor %}
-</div>
-
-The [official Sass port of Bootstrap]({{ site.sass_repo }}) was created and is maintained by this team. It became part of Bootstrap's organization with v3.1.0. Read the Sass [contributing guidelines](https://github.com/twbs/bootstrap-sass/blob/master/CONTRIBUTING.md) for information on how the Sass port is developed.