on master help sign in
Merge branch 'master' of github.com:urbit/urbit.org
commit7bc83af0b14b0340bf5686a3c7138a3c3494dfc8 authorMatilde Park <matilde@tlon.io> dateWed 2 Oct 2019, 12:58 (7 years ago) parentcabed7afb37da5
1 file changed+3−8
content/faq.md+3−8
content/faq.md+3−8
@@ -9,8 +9,7 @@ title = "FAQ"
99- [What is Urbit?](#what-is-urbit)
1010- [How secure is Urbit right now?](#how-secure-is-urbit)
1111- [How can I contribute to Urbit?](#contribute)
12−- [What is Tlon?](#what-is-tlon)
13−- [Who works at Tlon?](#who-works-at-tlon)
12+- [Who is building Urbit?](#who-builds-urbit)
1413
1514</details>
1615
@@ -98,13 +97,9 @@ The rest of the Urbit project is still in research-mode. Arvo is safe to play wi
9897
9998We encourage outside contributors to become a part of the project. The best way to do this is to check out [Urbit](https://github.com/urbit) on Github, look at the pinned repositories, and check out our [Contributing](https://urbit.org/docs/getting-started/contributing/) guide. After you've gotten familiar with the system, feel free to open issues and make pull requests.
10099
101−### What is Tlon? {#what-is-tlon}
100+### Who is building Urbit? {#who-builds-urbit}
102101
103−Tlon is the San Francisco-based company that develops the open-source (MIT licensed) Urbit project.
104−
105−### Who works at Tlon? {#who-works-at-tlon}
106−
107−You can see who we are at [tlon.io](https://tlon.io/).
102+[Tlon](https://tlon.io), a San Francisco-based company, is the primary developer of Urbit, along with [various independent developers](https://github.com/urbit/urbit/graphs/contributors) and [urbit.live](https://urbit.live).
108103
109104## Azimuth
110105