git.ipfire.org Git - ipfire.org.git/commit - src/backend/releases.py

]> git.ipfire.org Git - ipfire.org.git/commit - src/backend/releases.py

projects / ipfire.org.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 07499b8 70e89a2)

author	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 28 Nov 2021 12:15:45 +0000 (12:15 +0000)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 28 Nov 2021 12:15:45 +0000 (12:15 +0000)
commit	dda2ace8f8180fb0819829f03f1e1edfcea74106
tree	be903c169080ad946deabb96f5feb90ee5999d1a	tree \| snapshot
parent	07499b8156df2443f14a86f5a31f376cedb6127f	commit \| diff
parent	70e89a2e52a2d2891352bdbbae156aa6aa760c30	commit \| diff

Merge branch 'master' into new-design

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

Makefile.am	diff1 \|	diff2 \|	blob \| history
src/backend/accounts.py	diff1 \|	diff2 \|	blob \| history
src/backend/fireinfo.py	diff1 \|	diff2 \|	blob \| history
src/scss/style.scss	diff1 \|	diff2 \|	blob \| history
src/templates/location/index.html	diff1 \|	diff2 \|	blob \| history

The website of ipfire.org.