You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 54148b9a4a Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss		7 years ago
..
elephant-fren.png	Redesign the landing page, mount public timeline on it (#4122)	8 years ago
elephant-friend-1.png	Replace onboarding elephant with friendlier graphic, shorter animation (#3337)	8 years ago
elephant-friend.png	Replace sprockets/browserify with Webpack (#2617)	8 years ago
icon_about.png	Theme: Windows 95	7 years ago
icon_blocks.png	Theme: Windows 95	7 years ago
icon_home.png	Theme: Windows 95	7 years ago
icon_likes.png	Theme: Windows 95	7 years ago
icon_local.png	Theme: Windows 95	7 years ago
icon_logout.png	Theme: Windows 95	7 years ago
icon_mutes.png	Theme: Windows 95	7 years ago
icon_pin.png	Theme: Windows 95	7 years ago
icon_public.png	Theme: Windows 95	7 years ago
icon_settings.png	Theme: Windows 95	7 years ago
logo.svg	Remove redundant width/height values from SVGs to fix Safari bug (#4956)	7 years ago
logo_alt.svg	Remove redundant width/height values from SVGs to fix Safari bug (#4956)	7 years ago
logo_full.svg	Remove redundant width/height values from SVGs to fix Safari bug (#4956)	7 years ago
mastodon-not-found.png	Replace sprockets/browserify with Webpack (#2617)	8 years ago
mastodon-ui.png	Show mastodon on modal (#6129)	7 years ago
preview.jpg	Uploads for admin site settings (#4913)	7 years ago
screenshot.jpg	Screenshot support for themes	7 years ago
start.png	Theme: Windows 95	7 years ago
void.png	Replace sprockets/browserify with Webpack (#2617)	8 years ago
wave-compose-standalone.png	Show mastodon on modal (#6129)	7 years ago
wave-drawer.png	Move the mastodon on Getting Started column to drawer column (#6109)	7 years ago
wave-modal.png	Show mastodon on modal (#6129)	7 years ago