Skip to content

Commit

Permalink
merge and resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
gregsaun committed Aug 22, 2020
2 parents a5f0c93 + c42da16 commit 64fd53f
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Find optional parts designed by the community at [guides.bear-lab.com/Wiki/commu



## Community
## Partners and contributors

Here are the places were The Bear project is the most active on:

Expand All @@ -149,6 +149,7 @@ Here are the places were The Bear project is the most active on:

Do not hesitate to ask if you have a question.

Florian Däubler, Josh Jones and Stefan Maue are active developers supporting the work of Grégoire Saunier.


## Where can I get an official kit?
Expand Down
1 change: 1 addition & 0 deletions doc/icons/empty.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Binary file added doc/icons/patreon_50px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/icons/paypal_50px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/partners/3d_fused.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions doc/partners/empty.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Binary file added doc/partners/ldo_motors.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 64fd53f

Please sign in to comment.