Staging #17

Merged
julian-CStack merged 6 commits from staging into main 2023-06-09 18:36:46 +00:00

6 Commits

Author SHA1 Message Date
138a116c40 Merge remote-tracking branch 'origin/main' into staging
# Conflicts:
#	data/themes.json
#	data/themes/chan.zip
#	data/themes/dark.zip
#	data/themes/dark_chan.zip
#	data/themes/forest.zip
#	data/themes/fruit_sorbet.zip
#	data/themes/light.zip
#	data/themes/ocean_breeze.zip
#	data/themes/oled_black.zip
#	data/themes/orange.zip
2023-06-09 12:35:41 -06:00
485990033b HD chan cards + banano dark theme 2023-06-09 12:23:57 -06:00
Rylee Davis
5605bcaa55
Merge pull request #15 from cypherstack/update_nano
add nano + update main json
2023-06-08 11:29:23 -06:00
240a31e51c add nano + update main json 2023-06-08 11:27:43 -06:00
Rylee Davis
3b173cf8aa
Merge pull request #14 from cypherstack/update_nano
nano icon
2023-06-07 17:03:38 -06:00
8f438102be nano icon 2023-06-07 17:01:30 -06:00