catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

ac54da9394 Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699) Eugen 2017-04-13 19:36:41 +02:00
043862f411 Fix #1609, fix #1628 - Revert #1397 (#1700) Eugen 2017-04-13 19:23:36 +02:00
9e5c1c487e Apply i18n-tasks normalize to locales (#1696) Eugen 2017-04-13 19:18:32 +02:00
5619099564 translation: Fix comment out issue in en.jsx (#1698) INAGAKI Hiroshi 2017-04-14 00:11:18 +09:00
ce80d0b0a9 Fix minor jslint issue (#1697) Koala Yeung 2017-04-13 23:10:48 +08:00
6327f69cab Merge branch 'blackle-videolightbox' Eugen Rochko 2017-04-13 17:01:52 +02:00
5f8155482a Add overlay style to buttons, continue video after expanding it Eugen Rochko 2017-04-13 17:01:09 +02:00
efcf9448da Update settings_helper.rb Matteo Aquila 2017-04-13 16:16:39 +02:00
e70b84b1dc Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox Eugen Rochko 2017-04-13 16:14:11 +02:00
d7a4e8739a Ignore postgres/redis folder from docker-compose (#1645) Lukas Burk 2017-04-13 16:04:20 +02:00
9362700137 Convert emoji shortnames when sending status (#1666) Rachel H 2017-04-13 07:03:45 -07:00
1206627c59 Add Dutch translation (nl) (#1682) Koala Yeung 2017-04-13 22:02:23 +08:00
edefcfcf42 Fix issue where 'sensitive content click to show' item takes up whole screen on public view (#1692) Isabelle Knott 2017-04-13 10:00:56 -04:00
b330d1f000 Organize coverage dirs (#1695) Matt Jankowski 2017-04-13 10:00:31 -04:00
1a5a54eb4b Merge branch 'master' into master Eugen 2017-04-13 16:00:20 +02:00
447b8bc44e Do not show media attachment as og:image if it was marked as NSFW (#1693) Isabelle Knott 2017-04-13 09:59:43 -04:00
093879c177 Fix language export variables (#1689) Matt Jankowski 2017-04-13 09:59:12 -04:00
d2c20936f3 Merge remote-tracking branch 'origin/master' Matteo Aquila 2017-04-13 15:33:53 +02:00
0220f3a171 Update application.rb Matteo Aquila 2017-04-13 15:33:45 +02:00
905a4faa1c Update settings_helper.rb Matteo Aquila 2017-04-13 15:32:31 +02:00
5355b7d930 Update settings_helper.rb Matteo Aquila 2017-04-13 15:31:38 +02:00
aec2458d81 Merge remote-tracking branch 'tootsuite/master' Matteo Aquila 2017-04-13 15:30:04 +02:00
4fe5e04ea4 Fix csv export coverage in export spec (#1691) Matt Jankowski 2017-04-13 09:29:30 -04:00
3f42ad7d1a Rename simple_form.it.yml to config/locales/simple_form.it.yml Matteo Aquila 2017-04-13 15:28:30 +02:00
f7c466c8d8 Rename devise.it.yml to config/locales/devise.it.yml Matteo Aquila 2017-04-13 15:28:15 +02:00
245b9cb4ba Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml Matteo Aquila 2017-04-13 15:27:56 +02:00
9275f92972 Rename it.yml to config/locales/it.yml Matteo Aquila 2017-04-13 15:27:37 +02:00
4a6d3bac86 Merge pull request #1 from tootsuite/master Matteo Aquila 2017-04-13 15:23:20 +02:00
00cc3066a2 Allow video to be expanded into lightbox blackle 2017-04-13 09:04:18 -04:00
a57d30c680 [l10n] ja: update missing Japanese translations (#1687) YOSHIOKA Eiichiro 2017-04-13 21:39:14 +09:00
467d32fce3 [l10n] ja: update missing Japanese translations (#1684) Musee U 2017-04-13 04:40:58 -07:00
8aadb7b0b2 Exclude javascript locale file from dup check (#1677) Koala Yeung 2017-04-13 19:40:25 +08:00
79546799af Added Italian language (it) (#1679) Matteo Aquila 2017-04-13 13:39:00 +02:00
90d0018fd5 Adds Croatian language [Hrvatski] (#1000) May Kittens Devour Your Soul 2017-04-13 13:38:44 +02:00
1a12fd14d4 Merge branch 'master' into master Eugen 2017-04-13 13:26:16 +02:00
282bb55c3c fix Portuguese translation (#1661) Hugo Gameiro 2017-04-13 12:25:34 +01:00
0e4479bb3a Update Japanese translation files (#1640) 新都心(Neet Shin) 2017-04-13 16:53:45 +05:30
af7e880df5 Update Russian translation (#1570) Ratmir Karabut 2017-04-13 14:23:23 +03:00
aa7bf1515c Fix #624 - Add localization for Bulgarian (#645) Svetlozar Todorov 2017-04-13 14:16:28 +03:00
4f781b17cc Use input type number for Two-factor code (#1683) Daijiro Wachi 2017-04-13 13:13:17 +02:00
137100dcf3 Clean up well-known routes/controllers (#1649) Matt Jankowski 2017-04-13 07:09:07 -04:00
3a9eb81a80 Admin accounts controller cleanup (#1664) Matt Jankowski 2017-04-13 07:04:23 -04:00
0e39cc6a35 Settings export refactor (#1646) Matt Jankowski 2017-04-13 07:02:02 -04:00
faefd8ec8f Update javascript English translation files and some defaultValue (#1676) Koala Yeung 2017-04-13 18:57:41 +08:00
a18fd491b9 Added Italian language (it) matteoaquila 2017-04-13 11:47:03 +02:00
96715d9af5 Clear spoiler when replying to toot that doesn't also have a spoiler (#1662) Isabelle Knott 2017-04-12 21:17:34 -04:00
f24daa399b Remove pending specs for methods that dont exist (#1658) Matt Jankowski 2017-04-12 20:51:13 -04:00
af96e71883 Smoother scrolling on older iOS devices (#1654) tom 2017-04-12 20:50:56 -04:00
5dc73339ae Fix tests issue introduced in #1607 (#1639) Eugen 2017-04-13 02:17:40 +02:00
ccaf3dbc5a Adjustments to the Norwegian translation (#1648) Thor Harald Johansen 2017-04-13 02:17:26 +02:00
1ea662963f Use shift+click instead of alt+click to bypass boost dialog (#1638) Isabelle Knott 2017-04-12 20:15:45 -04:00
bd834add56 Fix visuals introduced in #1463 (#1634) Eugen 2017-04-12 20:54:49 +02:00
9966bd27c2 [l10n] ja: Improve Japanese Translations (#1631) lindwurm 2017-04-13 03:41:50 +09:00
b0ab632531 Fix missing compose box when viewport width is exactly 1024px (#1632) Isabelle Knott 2017-04-12 14:40:03 -04:00
e1264bbd92 Added norwegian version of terms of service and privacy policy (#1625) Knut Erik 2017-04-12 20:28:56 +02:00
38e24a699b fix Japanese translation (#1623) pinfort 2017-04-13 03:19:38 +09:00
bf3e56b8ad Fix incorrect notation in simple_form.ja.yml (#1620) Manato Kameya 2017-04-13 03:19:27 +09:00
9b698bf448 Update fr.jsx (#1551) goofy-bz 2017-04-12 20:11:09 +02:00
0254ee9795 significant improvement in microformats markup (#1063) Ben Roberts 2017-04-12 14:04:33 -04:00
e32edd247f Update fr.yml (#1600) CgX 2017-04-12 19:56:09 +02:00
dab9b5bd3a locale-fr: fix typo (#1603) karlyeurl 2017-04-12 19:54:16 +02:00
e17b5b228d Improve docker update instructions (#1619) Eugen 2017-04-12 19:34:40 +02:00
c4baa9fb6b vector (svg) logo with correct inner shape and colors (#1362) Julien Deswaef 2017-04-12 13:10:52 -04:00
c2a31b8032 Fix target blank on "open_in_web" link (#1612) David Libeau 2017-04-12 19:09:58 +02:00
9e63bf446e Request documentation (#1616) Shel R 2017-04-12 12:27:33 -04:00
c44a700252 Quick best practice cleanup of views/helpers (#1546) Matt Jankowski 2017-04-12 12:24:18 -04:00
aa90798386 Webfinger resource to extract username from resource string (#1607) Matt Jankowski 2017-04-12 12:22:38 -04:00
0930ce5560 Focus textarea when text is inserted (#1320) Rachel H 2017-04-12 09:21:07 -07:00
7f0a865b05 Allow import/export of mutes list (#1541) Matt Jankowski 2017-04-12 12:20:44 -04:00
08fce08217 Add unit tests for https://github.com/tootsuite/mastodon/pull/1574 (#1584) Henry Smith 2017-04-12 17:16:59 +02:00
3064ef96a1 Added missing Spanish translations strings (#1292) Carlos A. Escobar 2017-04-12 10:16:40 -05:00
ee69ece7b5 [web] Moving docs link to tootsuite/documentation (#1581) lindwurm 2017-04-13 00:13:19 +09:00
d90d23699c Make Reporting admin section translatable (#1549) Thomas Citharel 2017-04-12 17:11:49 +02:00
1f5ff46fd9 Working translation for Norwegian. (#1611) Thor Harald Johansen 2017-04-12 17:07:51 +02:00
13528f50c3 Params compact deprecation warning (#1580) Matt Jankowski 2017-04-12 10:12:56 -04:00
dd1ae3b109 Simplify the way the embed view is created (#1590) Matt Jankowski 2017-04-12 10:12:42 -04:00
b352a8e5d4 Default to json type for webfinger requests (#1583) Matt Jankowski 2017-04-12 10:03:37 -04:00
fd102059aa Clean up stylesheet organization (#1591) Matt Jankowski 2017-04-12 10:01:59 -04:00
323671a653 Silence more scope order warnings (#1604) Matt Jankowski 2017-04-12 09:58:08 -04:00
b155e6ccf5 Fix issue with intermittent api/v1/notifications failure (#1606) Matt Jankowski 2017-04-12 09:53:55 -04:00
f16b9a4928 Fix redirect link on Tuning.md (#1595) Christopher Su 2017-04-12 03:40:37 -07:00
24eb45425e Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544) Koala Yeung 2017-04-12 14:50:50 +08:00
3442bc0ea3 update Docker section of README (#1231) Eric Blade 2017-04-11 19:14:56 -04:00
40bdf43297 Change default log level in production from :debug to :info for less I/O (#1579) Eugen 2017-04-11 23:28:23 +02:00
8ead070b94 Improve emoji picker look (#1493) Eugen 2017-04-11 23:23:34 +02:00
b22b2cbfac Fix #1491 - Fix broken notifications, broken Link header parsing for exclude_types (#1548) Eugen 2017-04-11 22:53:58 +02:00
2f2b84bfbb Add task in order to delete unconfirmed users (older than 2days) (#1571) d0p1 2017-04-11 22:51:17 +02:00
5cdd2c2414 Fix #1535 - #1372 set a wrong default on :openssl_verify_mode (#1563) Eugen 2017-04-11 22:49:53 +02:00
3ddd936b03 Refactor exports controller (#1567) Matt Jankowski 2017-04-11 16:00:43 -04:00
1921c5416b Fix console error when scrolling a column with no scrollable content (#1574) Henry Smith 2017-04-11 21:58:28 +02:00
fc47c1d00e [about] Moving docs link to tootsuite/documentation (#1573) lindwurm 2017-04-12 04:57:05 +09:00
327a6e166f Update french locale (#1525) Thomas Citharel 2017-04-11 21:54:40 +02:00
6f5268b02d Add Japanese translation (#1552) pinfort 2017-04-12 04:52:09 +09:00
4964433190 Revised finnish translation (#1537) jukper 2017-04-11 22:41:40 +03:00
9e3c4fd2d7 Update language files (#1516) Jantso Porali 2017-04-11 21:41:29 +02:00
89e8e110c8 Imports controller errors (#1553) Matt Jankowski 2017-04-11 15:40:14 -04:00
9f7ea77d0c Merge branch 'master' of github.com:tootsuite/mastodon Eugen Rochko 2017-04-11 21:30:48 +02:00
5f74397ef0 Merge branch 'blackle-master' Eugen Rochko 2017-04-11 21:30:34 +02:00
960181fd99 Fix look of the modals Eugen Rochko 2017-04-11 21:24:17 +02:00
2a7602cad4 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master Eugen Rochko 2017-04-11 20:43:56 +02:00
47aacb773b Better background-photo.jpeg (#1560) Komic 2017-04-11 19:51:13 +02:00
82d9336114 Increase breakpoint size for bio on account show (#1559) Matt Jankowski 2017-04-11 13:35:06 -04:00
e60286a344 Remove unused methods from StreamEntriesHelper (#1365) Matt Jankowski 2017-04-11 13:32:02 -04:00
53850bce93 Remove unused AtomBuilderHelper (#1364) Matt Jankowski 2017-04-11 13:31:22 -04:00
1236529e39 Moving docs to tootsuite/documentation (#1550) Eugen 2017-04-11 18:03:02 +02:00
06444bf050 Allow user to disable the boost confirm dialog in preferences blackle 2017-04-11 10:10:16 -04:00
b723ee73fc Add (commented) volume in docker-compose && Mitigating the HTTPoxy Vulnerability (#1253) Valentin Ouvrard 2017-04-12 01:04:56 +11:00
c35bda0551 fix(*): ruby version was updated in .ruby-version but not Vagrant. Make them match (#1502) Gavin Mogan 2017-04-11 06:06:07 -07:00
f53fb6aa66 Bypass boost confirm modal if alt is pressed blackle 2017-04-11 08:34:14 -04:00
a85d4473aa Avoid user enumeration with devise paranoid mode (#1527) Yann GUERN 2017-04-11 14:21:15 +02:00
c9b9225951 Adjust css for user detail page (#1463) Corey Dutson 2017-04-11 08:20:18 -04:00
11898a6461 Add Mastodon.tools (#1457) David Libeau 2017-04-11 05:30:40 +02:00
01e5447e35 Add boost confirm modal blackle 2017-04-10 22:28:52 -04:00
4ada50985a Pagination improvements (#1445) Matt Jankowski 2017-04-10 19:11:41 -04:00
a283786463 Add note about minimum docker-compose version (#1264) Effy Elden 2017-04-11 08:39:39 +10:00
12f72e1740 When avatar/header are GIF, generate static versions (#1428) Eugen 2017-04-11 00:38:58 +02:00
b57eed4584 Remove order prior to .find_in_batches (#1470) Matt Jankowski 2017-04-10 18:38:34 -04:00
3672a799d4 Dev Tooling fixes (eslint/editorconfig) (#1398) Gavin Mogan 2017-04-10 15:36:03 -07:00
3fd5385e7b Add username as a title for mentions (#1385) Matthias Jouan 2017-04-11 00:35:35 +02:00
d439855a6d Adds error message to mastodon:confirm_email task. (#1476) Ash Furrow 2017-04-10 18:13:08 -04:00
2810013b93 API param to exclude notification types from response (#1341) Eugen 2017-04-10 23:45:29 +02:00
0687ab8ae3 Clean up generation of account webfinger string (#1477) Matt Jankowski 2017-04-10 16:58:06 -04:00
64dbde0dbf Version bumps for ruby and misc gems (#1159) Matt Jankowski 2017-04-10 16:47:41 -04:00
ae57b3a8c5 Add more specific class names to notification divs (#1120) Chris Martin 2017-04-10 16:41:52 -04:00
0dbbc16c69 More SMTP customization (#1372) Alexander Mankuta 2017-04-10 22:48:30 +03:00
f690320fb9 Keep newlines in xml (#1397) Rachel H 2017-04-10 12:32:45 -07:00
553170b77a Fix #1097 When onClick is falsy, do not make status content clickable (#1434) Stephen Burgess 2017-04-10 14:31:26 -05:00
8a6096a3de Allow typing a toot while an image uploads (#1429) Jessica Stokes 2017-04-11 05:30:58 +10:00
d2f6d9b9fb Fix issue with missing emojify class in views (#1455) Matt Jankowski 2017-04-10 15:27:52 -04:00
dbe9f33fdc Admin base controller (#1465) Matt Jankowski 2017-04-10 15:27:03 -04:00
1be6aa0c7f Fix references to "v1" API (#1460) Alexsander Akers 2017-04-10 21:11:59 +02:00
087ca3009b Adjust background of emoji panel (#1461) Corey Dutson 2017-04-10 14:56:14 -04:00
db7c7d1af1 Improve scrolling behaviour (#1415) Jessica Stokes 2017-04-11 00:27:30 +10:00
42fb4faa0f Fix icon and emoji sizes (#1403) Ram Lmn 2017-04-10 16:32:09 +05:30
9bb398ee91 Minor clarifications (#1386) Ryan Freebern 2017-04-10 07:01:43 -04:00
9043b32183 Add Russian translation (ru) (#1023) Ratmir Karabut 2017-04-10 13:52:06 +03:00
e30bbb1cb0 Fix for Import issue from URL (#1416) Jantso Porali 2017-04-10 12:49:34 +02:00
8bdf02812c Add search to emoji picker (#1395) Gavin Mogan 2017-04-10 00:58:09 -07:00
93db265be7 Do not store last visited URL from API controllers (#1330) Eugen 2017-04-09 22:21:52 +02:00
c172919745 Fix #1339 - better Atom titles (#1343) Eugen 2017-04-09 20:55:54 +02:00
15d442cf9d Fix /api/v1/accounts/update_credentials tests (#1357) Eugen 2017-04-09 20:23:14 +02:00
43f955e31f Minor change to Entity on API.md (Relationship) (#1356) Ornithologist Coder 2017-04-09 19:10:38 +02:00
4ea4ef9d0f update portuguese translation (#1280) Hugo Gameiro 2017-04-09 17:49:26 +01:00
d19ed18388 Get handle from atom feed's author/email field instead of guessing from URL (#1344) ThibG 2017-04-09 18:43:48 +02:00
f0bd439486 Use HTTP Accept-Language to detect locale (#1166) David Authier 2017-04-09 18:40:24 +02:00
b16fbd52b2 Minor API.md changes (#1351) Ornithologist Coder 2017-04-09 18:36:03 +02:00
3b34c28bee Minor change on API.md (#1352) Ornithologist Coder 2017-04-09 18:35:51 +02:00
8bfdbf0aa6 Add comment to settings.yml to nudge admins towards editing values via Web UI (#1289) R Tucker 2017-04-09 12:34:29 -04:00
d4fe6cd2bf Allow users to update their Account in the API (#1179) David Celis 2017-04-09 09:33:40 -07:00
ea6c930c04 Helper cleanup (#1348) Matt Jankowski 2017-04-09 11:11:37 -04:00
12e29c9660 Update fr.jsx (#1329) StefOfficiel 2017-04-09 14:58:08 +02:00
082bef3027 French translation update (#1271) Olivier Humbert 2017-04-09 14:55:58 +02:00
e6b48a7048 French typo (#1257) spf 2017-04-09 14:54:47 +02:00
ba2aea3a80 add empty notifications french translation (#1111) Jonathan Klee 2017-04-09 14:54:02 +02:00
e5282e4ec0 Clean up about page (#1282) Matt Jankowski 2017-04-09 08:47:25 -04:00
53eb31f124 Fixes #1311 margin shouldn't stay fixed (#1312) Brian Mock 2017-04-09 05:45:26 -07:00
388ec0d5b6 Search cleanup (#1333) Matt Jankowski 2017-04-09 08:45:01 -04:00
71706f21c2 Ignore implied formats for catch all route requests (#1340) Matt Jankowski 2017-04-09 08:39:41 -04:00
b1881a3d48 Fix nonworking clear notices button (#1316) Rachel H 2017-04-09 02:35:23 -07:00
d5a675099a Add env variable to disable prepared statements (#1293) Eugen 2017-04-09 05:46:32 +02:00
c3e7bac1cc Allows setting log level in env variable (#1290) Ash Furrow 2017-04-08 19:42:13 -04:00
6e3925521d Adds user confirmation rake task (#1300) Ash Furrow 2017-04-08 19:09:46 -04:00
b89f007862 Make public timelines API not require user context/app credentials (#1291) Eugen 2017-04-08 23:39:31 +02:00
9acdb166e8 Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278) Eugen 2017-04-08 22:20:08 +02:00
470eb0042e Improve responsiveness of registration form and closed banner (#1265) Pavel Djundik 2017-04-08 19:31:50 +03:00
fc146a19cc Improve about page responsiveness (#1252) Pavel Djundik 2017-04-08 16:28:23 +03:00
941a593ea8 Add mst3k.interlinked.me to list of instances (#1235) Elizabeth Myers 2017-04-08 06:48:16 -05:00
982fef811e Fix #1141, fix #1126 - Avatar/profile info fetching (#1215) Eugen 2017-04-08 13:26:03 +02:00
41f8fde83e Update french translation (#1148) Thomas Citharel 2017-04-08 13:11:16 +02:00
157f0a2aa7 Add titles to more icons, and change clear notifications icon. (#1101) Markus Amalthea Magnuson 2017-04-08 13:07:55 +02:00
49043f644d Update mastodon.brussels instance name on List of Instances kadiix 2017-04-08 13:05:49 +02:00
c803f5b440 Updated German translation (#1248) Nicolai von Neudeck 2017-04-08 13:04:58 +02:00
f860eb7d71 Fixed two translation errors (#1139) Sebastian Hübner 2017-04-08 13:03:11 +02:00
8f9a11b642 Update simple_form.de.yml (#971) Korbinian 2017-04-08 13:02:07 +02:00
c6b0707cf6 Update mastodon.nuzgo.net (#1242) Thibaut (Eychics) 2017-04-08 12:34:53 +02:00
b79c80b620 Add OTP_SECRET to Heroku app.json (#1246) James Smith 2017-04-08 11:31:33 +01:00
211920b622 Revert "add persistance to Postresql container" (#1251) Eugen 2017-04-08 12:25:23 +02:00
01d8003867 Updated about page in Finnish language (#1170) Jantso Porali 2017-04-08 12:17:34 +02:00
ed3dfd0bee French translation update (#1188) Olivier Humbert 2017-04-08 12:16:49 +02:00
35eff3f2d0 Add some missing strings to prevent some React warning in the console (#1230) Alda Marteau-Hardi 2017-04-08 12:16:16 +02:00
ca44c13455 Use Setting.site_title value for og:site_name occurrences (#1194) Matt Jankowski 2017-04-08 06:15:40 -04:00
a345eb44fc Merge pull request #1239 from ineffyble/patch-2 Eugen 2017-04-08 11:40:43 +02:00
7b814d5bcb Merge pull request #1238 from milmazz/hunter-client Eugen 2017-04-08 11:40:20 +02:00
9f9f4b248e Merge pull request #887 from valentin2105/master Eugen 2017-04-08 11:39:25 +02:00
3660f01f60 Merge pull request #1115 from vmincev/patch-1 Eugen 2017-04-08 11:38:54 +02:00
a2ec54a20b Merge pull request #1198 from huertanix/patch-1 Eugen 2017-04-08 11:38:33 +02:00
e33dcb79c6 Merge pull request #1221 from rbaumert/patch-1 Eugen 2017-04-08 11:37:51 +02:00
7d5ea5c170 Merge pull request #1224 from chrisheninger/patch-1 Eugen 2017-04-08 11:37:37 +02:00
33849acfa7 Merge pull request #1218 from R0ckweb/patch-2 Eugen 2017-04-08 11:37:13 +02:00
c141f0a886 Merge pull request #1216 from tootsuite/fix-default-locale-regression Eugen 2017-04-08 11:36:43 +02:00
55d03da303 Merge pull request #1213 from tootsuite/fix-accounts-initial-case Eugen 2017-04-08 11:36:35 +02:00
2c3a730eae Merge pull request #1225 from tootsuite/yiskah-patch-1 Eugen 2017-04-08 11:35:40 +02:00
b04cbb9f5d

Add reference to Elixir client for Mastodon API Milton Mazzarri 2017-04-08 02:48:52 -05:00
75aade3de2 Fix my URL Effy Elden 2017-04-08 16:22:07 +10:00
ac0b84534e Merge branch 'master' into patch-1 rbaumert 2017-04-07 21:39:24 -07:00
3c48c9ac2e Merge branch 'master' into master Valentin Ouvrard 2017-04-08 15:11:20 +11:00
ecf0320a78 Close instance list to additions Shel R 2017-04-07 23:51:30 -04:00
40703b96fa Merge branch 'master' into fix-default-locale-regression Kurtis Rainbolt-Greene 2017-04-07 20:50:21 -07:00
1e4453405b Merge branch 'master' into patch-2 Kurtis Rainbolt-Greene 2017-04-07 20:48:27 -07:00
0ad694f96b Add SVG version of logo to repo Chris Heninger 2017-04-07 20:40:18 -07:00