diff options
| author |  Amine Mouafik <amine@mouafik.fr> | 2019-11-28 19:39:04 +0700 |
|---|---|---|
| committer | Amine Mouafik <amine@mouafik.fr> | 2019-11-28 19:39:04 +0700 |
| commit | be1f308a2b6dec4fa6992315bfb2c1f44dde86b8 (patch) | |
| tree | 33fdcd100c5bea0420b1493072ffcdcf75ad4b87 /.all-contributorsrc | |
| parent | Add list of entitlements including mic/video (diff) | |
| parent | Merge branch 'develop' of github.com:getferdi/ferdi into develop (diff) | |
| download | ferdium-app-be1f308a2b6dec4fa6992315bfb2c1f44dde86b8.tar.gz ferdium-app-be1f308a2b6dec4fa6992315bfb2c1f44dde86b8.tar.zst ferdium-app-be1f308a2b6dec4fa6992315bfb2c1f44dde86b8.zip | |
Merge branch 'develop' into fix/audio-video-on-macos
Diffstat (limited to '.all-contributorsrc')
| -rw-r--r-- | .all-contributorsrc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/.all-contributorsrc b/.all-contributorsrc index 832fcd243..487175335 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc | |||
| @@ -242,6 +242,15 @@ | |||
| 242 | "code", | 242 | "code", |
| 243 | "ideas" | 243 | "ideas" |
| 244 | ] | 244 | ] |
| 245 | }, | ||
| 246 | { | ||
| 247 | "login": "brorbw", | ||
| 248 | "name": "Bror Winther", | ||
| 249 | "avatar_url": "https://avatars2.githubusercontent.com/u/5909562?v=4", | ||
| 250 | "profile": "https://github.com/brorbw", | ||
| 251 | "contributions": [ | ||
| 252 | "doc" | ||
| 253 | ] | ||
| 245 | } | 254 | } |
| 246 | ], | 255 | ], |
| 247 | "contributorsPerLine": 6 | 256 | "contributorsPerLine": 6 |