LemmyNet
/
lemmy
3
2
Fork 3
Code Pull Requests 1 Releases Wiki Activity

Merge master into federation #48

Manually merged
nutomic merged 120 commits from merge-master into federation 2020-06-09 18:07:02 +00:00
Conversation 3 Commits 120 Files Changed 57 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ed553aa9f0 - Show all commits

2
server/Cargo.toml vendored
View File

@ -1,7 +1,7 @@
[package] [package]
name = "lemmy_server" name = "lemmy_server"
version = "0.0.1" version = "0.0.1"
authors = ["Dessalines <happydooby@gmail.com>"] authors = ["Dessalines <tyhou13@gmx.com>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]

2
ui/src/components/sponsors.tsx vendored
View File

@ -21,7 +21,7 @@ let highlighted = ['Oskenso Kashi', 'Alex Benishek'];
let silver: Array<SilverUser> = [ let silver: Array<SilverUser> = [
{ {
name: 'Redjoker', name: 'Redjoker',
link: 'https://redcard.iww.org/user/register', link: 'https://iww.org',
}, },
]; ];
// let gold = []; // let gold = [];