Commit graph

  • 87e8f5ae03 Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278) Eugen 2017-04-08 22:20:08 +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
  • 102441de1a Improve responsiveness of registration form and closed banner (#1265) Pavel Djundik 2017-04-08 19:31:50 +03:00
  • 470eb0042e Improve responsiveness of registration form and closed banner (#1265) Pavel Djundik 2017-04-08 19:31:50 +03:00
  • 87351599b8 Improve about page responsiveness (#1252) Pavel Djundik 2017-04-08 16:28:23 +03:00
  • fc146a19cc Improve about page responsiveness (#1252) Pavel Djundik 2017-04-08 16:28:23 +03:00
  • 3246fad456 Add mst3k.interlinked.me to list of instances (#1235) Elizabeth Myers 2017-04-08 06:48:16 -05:00
  • 941a593ea8 Add mst3k.interlinked.me to list of instances (#1235) Elizabeth Myers 2017-04-08 06:48:16 -05:00
  • e258d05848 Merge branch 'master' into skylight Eugen Rochko 2017-04-08 13:27:04 +02:00
  • 28b9d10b24 Fix #1141, fix #1126 - Avatar/profile info fetching (#1215) Eugen 2017-04-08 13:26:03 +02:00
  • 982fef811e Fix #1141, fix #1126 - Avatar/profile info fetching (#1215) Eugen 2017-04-08 13:26:03 +02:00
  • 7c81c0f7cb Merge branch 'master' into skylight Eugen Rochko 2017-04-08 13:24:25 +02:00
  • a586f7af8a Update french translation (#1148) Thomas Citharel 2017-04-08 13:11:16 +02:00
  • 41f8fde83e Update french translation (#1148) Thomas Citharel 2017-04-08 13:11:16 +02:00
  • fd42948108 Add titles to more icons, and change clear notifications icon. (#1101) Markus Amalthea Magnuson 2017-04-08 13:07:55 +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
  • 260d426cf6 Update mastodon.brussels instance name on List of Instances kadiix 2017-04-08 13:05:49 +02:00
  • 49043f644d Update mastodon.brussels instance name on List of Instances kadiix 2017-04-08 13:05:49 +02:00
  • c5f75f1858 Updated German translation (#1248) Nicolai von Neudeck 2017-04-08 13:04:58 +02:00
  • c803f5b440 Updated German translation (#1248) Nicolai von Neudeck 2017-04-08 13:04:58 +02:00
  • 0e9b0d711f Fixed two translation errors (#1139) Sebastian Hübner 2017-04-08 13:03:11 +02:00
  • f860eb7d71 Fixed two translation errors (#1139) Sebastian Hübner 2017-04-08 13:03:11 +02:00
  • dd333d9bd6 Update simple_form.de.yml (#971) Korbinian 2017-04-08 13:02:07 +02:00
  • 8f9a11b642 Update simple_form.de.yml (#971) Korbinian 2017-04-08 13:02:07 +02:00
  • f43fee82c7 Update mastodon.nuzgo.net (#1242) Thibaut (Eychics) 2017-04-08 12:34:53 +02:00
  • c6b0707cf6 Update mastodon.nuzgo.net (#1242) Thibaut (Eychics) 2017-04-08 12:34:53 +02:00
  • c4112f02a5 Add OTP_SECRET to Heroku app.json (#1246) James Smith 2017-04-08 11:31:33 +01:00
  • b79c80b620 Add OTP_SECRET to Heroku app.json (#1246) James Smith 2017-04-08 11:31:33 +01:00
  • 598316829c Revert "add persistance to Postresql container" (#1251) Eugen 2017-04-08 12:25:23 +02:00
  • 211920b622 Revert "add persistance to Postresql container" (#1251) Eugen 2017-04-08 12:25:23 +02:00
  • 5b3a326e15 Updated about page in Finnish language (#1170) Jantso Porali 2017-04-08 12:17:34 +02:00
  • 01d8003867 Updated about page in Finnish language (#1170) Jantso Porali 2017-04-08 12:17:34 +02:00
  • 1d474d0fbb French translation update (#1188) Olivier Humbert 2017-04-08 12:16:49 +02:00
  • ed3dfd0bee French translation update (#1188) Olivier Humbert 2017-04-08 12:16:49 +02:00
  • c7609b09df Add some missing strings to prevent some React warning in the console (#1230) Alda Marteau-Hardi 2017-04-08 12:16:16 +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
  • 854eb172f6 Use Setting.site_title value for og:site_name occurrences (#1194) Matt Jankowski 2017-04-08 06:15:40 -04:00
  • ca44c13455 Use Setting.site_title value for og:site_name occurrences (#1194) Matt Jankowski 2017-04-08 06:15:40 -04:00
  • a2ad62e0a9 Merge pull request #1239 from ineffyble/patch-2 Eugen 2017-04-08 11:40:43 +02:00
  • a345eb44fc Merge pull request #1239 from ineffyble/patch-2 Eugen 2017-04-08 11:40:43 +02:00
  • 9c3da0aeb5 Merge pull request #1238 from milmazz/hunter-client Eugen 2017-04-08 11:40:20 +02:00
  • 7b814d5bcb Merge pull request #1238 from milmazz/hunter-client Eugen 2017-04-08 11:40:20 +02:00
  • bab775b101 Merge pull request #887 from valentin2105/master Eugen 2017-04-08 11:39:25 +02:00
  • 9f9f4b248e Merge pull request #887 from valentin2105/master Eugen 2017-04-08 11:39:25 +02:00
  • ffe8d6a8d3 Merge pull request #1115 from vmincev/patch-1 Eugen 2017-04-08 11:38:54 +02:00
  • 3660f01f60 Merge pull request #1115 from vmincev/patch-1 Eugen 2017-04-08 11:38:54 +02:00
  • b6892deb07 Merge pull request #1198 from huertanix/patch-1 Eugen 2017-04-08 11:38:33 +02:00
  • a2ec54a20b Merge pull request #1198 from huertanix/patch-1 Eugen 2017-04-08 11:38:33 +02:00
  • 7c9caa25cc Merge pull request #1221 from rbaumert/patch-1 Eugen 2017-04-08 11:37:51 +02:00
  • e33dcb79c6 Merge pull request #1221 from rbaumert/patch-1 Eugen 2017-04-08 11:37:51 +02:00
  • 5bf2addd8c Merge pull request #1224 from chrisheninger/patch-1 Eugen 2017-04-08 11:37:37 +02:00
  • 7d5ea5c170 Merge pull request #1224 from chrisheninger/patch-1 Eugen 2017-04-08 11:37:37 +02:00
  • 78fe92b919 Merge pull request #1218 from R0ckweb/patch-2 Eugen 2017-04-08 11:37:13 +02:00
  • 33849acfa7 Merge pull request #1218 from R0ckweb/patch-2 Eugen 2017-04-08 11:37:13 +02:00
  • 3ae713667f Merge pull request #1216 from tootsuite/fix-default-locale-regression Eugen 2017-04-08 11:36:43 +02:00
  • c141f0a886 Merge pull request #1216 from tootsuite/fix-default-locale-regression Eugen 2017-04-08 11:36:43 +02:00
  • 42a75995ae Merge pull request #1213 from tootsuite/fix-accounts-initial-case Eugen 2017-04-08 11:36:35 +02:00
  • 55d03da303 Merge pull request #1213 from tootsuite/fix-accounts-initial-case Eugen 2017-04-08 11:36:35 +02:00
  • ab0118a535 Merge pull request #1225 from tootsuite/yiskah-patch-1 Eugen 2017-04-08 11:35:40 +02:00
  • 2c3a730eae Merge pull request #1225 from tootsuite/yiskah-patch-1 Eugen 2017-04-08 11:35:40 +02:00
  • 93f2294637 Add reference to Elixir client for Mastodon API Milton Mazzarri 2017-04-08 02:48:52 -05:00
  • b04cbb9f5d
    Add reference to Elixir client for Mastodon API Milton Mazzarri 2017-04-08 02:48:52 -05:00
  • b6504f4a5a Fix my URL Effy Elden 2017-04-08 16:22:07 +10:00
  • 75aade3de2 Fix my URL Effy Elden 2017-04-08 16:22:07 +10:00
  • e37ee816b7 Merge branch 'master' into patch-1 rbaumert 2017-04-07 21:39:24 -07:00
  • ac0b84534e Merge branch 'master' into patch-1 rbaumert 2017-04-07 21:39:24 -07:00
  • 125d041186 Merge branch 'master' into master Valentin Ouvrard 2017-04-08 15:11:20 +11:00
  • 3c48c9ac2e Merge branch 'master' into master Valentin Ouvrard 2017-04-08 15:11:20 +11:00
  • d55abc54c8 Close instance list to additions Shel R 2017-04-07 23:51:30 -04:00
  • ecf0320a78 Close instance list to additions Shel R 2017-04-07 23:51:30 -04:00
  • 17dff01b0d Merge branch 'master' into fix-default-locale-regression Kurtis Rainbolt-Greene 2017-04-07 20:50:21 -07:00
  • 40703b96fa Merge branch 'master' into fix-default-locale-regression Kurtis Rainbolt-Greene 2017-04-07 20:50:21 -07:00
  • a23b3c63d3 Merge branch 'master' into patch-2 Kurtis Rainbolt-Greene 2017-04-07 20:48:27 -07:00
  • 1e4453405b Merge branch 'master' into patch-2 Kurtis Rainbolt-Greene 2017-04-07 20:48:27 -07:00
  • 4a39339b33 Add SVG version of logo to repo Chris Heninger 2017-04-07 20:40:18 -07:00
  • 0ad694f96b Add SVG version of logo to repo Chris Heninger 2017-04-07 20:40:18 -07:00
  • 83eb0fe13e Merge pull request #1137 from Noiwex/patch-1 Shel R 2017-04-07 23:16:46 -04:00
  • 541c538f9b Merge pull request #1137 from Noiwex/patch-1 Shel R 2017-04-07 23:16:46 -04:00
  • 4d341a40e7 Merge branch 'master' into patch-1 Shel R 2017-04-07 23:15:17 -04:00
  • 50910d1543 Merge branch 'master' into patch-1 Shel R 2017-04-07 23:15:17 -04:00
  • cc142c2dd4 Merge pull request #1197 from blakebarnett/add_indigo_zone_instance Shel R 2017-04-07 23:10:25 -04:00
  • 4ff8653d6c Merge pull request #1197 from blakebarnett/add_indigo_zone_instance Shel R 2017-04-07 23:10:25 -04:00
  • b088d15866 Merge branch 'master' into add_indigo_zone_instance Shel R 2017-04-07 23:09:50 -04:00
  • 17690f51a2 Merge branch 'master' into add_indigo_zone_instance Shel R 2017-04-07 23:09:50 -04:00
  • 0767340635 Merge pull request #1196 from mouse-reeve/list-oulipo-social Shel R 2017-04-07 23:09:09 -04:00
  • cf80cb5e8b Merge pull request #1196 from mouse-reeve/list-oulipo-social Shel R 2017-04-07 23:09:09 -04:00
  • 9d2b2efffb Merge branch 'master' into list-oulipo-social Shel R 2017-04-07 23:08:41 -04:00
  • 315ff648c8 Merge branch 'master' into list-oulipo-social Shel R 2017-04-07 23:08:41 -04:00
  • 3abb08f681 Merge pull request #1186 from Aguay-val/patch-2 Shel R 2017-04-07 23:07:50 -04:00
  • 41923d1c6b Merge pull request #1186 from Aguay-val/patch-2 Shel R 2017-04-07 23:07:50 -04:00
  • 926cda5afd Merge branch 'master' into patch-2 Shel R 2017-04-07 23:05:08 -04:00
  • 63686fd36f Merge branch 'master' into patch-2 Shel R 2017-04-07 23:05:08 -04:00
  • 4a7531704d Merge branch 'master' into patch-1 Shel R 2017-04-07 23:03:07 -04:00
  • ae9d2f4a32 Merge branch 'master' into patch-1 Shel R 2017-04-07 23:03:07 -04:00
  • 52a31285d9 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:59:07 -04:00
  • 741bbba6ff Merge branch 'master' into patch-1 Shel R 2017-04-07 22:59:07 -04:00
  • 45042eb96e Merge pull request #1107 from YDrogen/patch-1 Shel R 2017-04-07 22:54:44 -04:00
  • a25a384af3 Merge pull request #1107 from YDrogen/patch-1 Shel R 2017-04-07 22:54:44 -04:00
  • 956c8e9033 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:54:25 -04:00
  • 971c4de18c Merge branch 'master' into patch-1 Shel R 2017-04-07 22:54:25 -04:00
  • 1665dc584a Merge pull request #1090 from gled-rs/master Shel R 2017-04-07 22:54:14 -04:00
  • 394c8ef680 Merge pull request #1090 from gled-rs/master Shel R 2017-04-07 22:54:14 -04:00
  • 989ea9617c Merge branch 'master' into master Shel R 2017-04-07 22:53:42 -04:00
  • 3c5b0c55cb Merge branch 'master' into master Shel R 2017-04-07 22:53:42 -04:00
  • df94d68fd1 Merge pull request #1085 from isati/patch-2 Shel R 2017-04-07 22:49:34 -04:00
  • 0dcf3c6abe Merge pull request #1085 from isati/patch-2 Shel R 2017-04-07 22:49:34 -04:00
  • 802ab614f3 Merge branch 'master' into patch-2 Shel R 2017-04-07 22:49:14 -04:00
  • b67b60fec3 Merge branch 'master' into patch-2 Shel R 2017-04-07 22:49:14 -04:00
  • 1fe8fd8caf fixed a sentence in readme rbaumert 2017-04-07 19:48:46 -07:00
  • 2c0ef75f58 fixed a sentence in readme rbaumert 2017-04-07 19:48:46 -07:00
  • d405febba8 Merge pull request #1084 from genesixx/patch-4 Shel R 2017-04-07 22:48:02 -04:00
  • cc16fa7513 Merge pull request #1084 from genesixx/patch-4 Shel R 2017-04-07 22:48:02 -04:00
  • 319ec509e0 Merge branch 'master' into patch-4 Shel R 2017-04-07 22:47:42 -04:00
  • d6827e38a6 Merge branch 'master' into patch-4 Shel R 2017-04-07 22:47:42 -04:00
  • ec3f5e6750 Merge pull request #1074 from kadiix/patch-1 Shel R 2017-04-07 22:47:00 -04:00
  • 29ed448445 Merge pull request #1074 from kadiix/patch-1 Shel R 2017-04-07 22:47:00 -04:00
  • 090ae1d10e Merge branch 'master' into patch-1 Shel R 2017-04-07 22:46:36 -04:00
  • e7d7a99fbc Merge branch 'master' into patch-1 Shel R 2017-04-07 22:46:36 -04:00
  • 565b7d962f Merge pull request #1069 from Awea/master Shel R 2017-04-07 22:45:15 -04:00
  • 8d27de32b3 Merge pull request #1069 from Awea/master Shel R 2017-04-07 22:45:15 -04:00
  • 5800f8d9cc Merge branch 'master' into master Shel R 2017-04-07 22:44:40 -04:00
  • abab82ec1e Merge branch 'master' into master Shel R 2017-04-07 22:44:40 -04:00
  • e34da966e9 Merge pull request #1066 from jack-michaud/master Shel R 2017-04-07 22:43:46 -04:00
  • f0797bf8ce Merge pull request #1066 from jack-michaud/master Shel R 2017-04-07 22:43:46 -04:00
  • aab0f8f85d Merge branch 'master' into master Shel R 2017-04-07 22:43:13 -04:00
  • 38c5130930 Merge branch 'master' into master Shel R 2017-04-07 22:43:13 -04:00
  • 9850c9b8ab Merge pull request #1051 from Tiwy57/patch-1 Shel R 2017-04-07 22:42:34 -04:00
  • ee8af9083a Merge pull request #1051 from Tiwy57/patch-1 Shel R 2017-04-07 22:42:34 -04:00
  • 7e08b9e667 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:42:14 -04:00
  • c9f15f7991 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:42:14 -04:00
  • 33bff5b268 Merge pull request #1050 from lfuelling/patch-1 Shel R 2017-04-07 22:41:37 -04:00
  • 91afe1f8fd Merge pull request #1050 from lfuelling/patch-1 Shel R 2017-04-07 22:41:37 -04:00
  • 9ec69a78ec Merge branch 'master' into patch-1 Shel R 2017-04-07 22:41:07 -04:00
  • 9edee2e64f Merge branch 'master' into patch-1 Shel R 2017-04-07 22:41:07 -04:00
  • e0e048a404 Merge pull request #1046 from raymestalez/patch-2 Shel R 2017-04-07 22:40:29 -04:00
  • d7e1a282fe Merge pull request #1046 from raymestalez/patch-2 Shel R 2017-04-07 22:40:29 -04:00
  • c83b76efb6 Merge branch 'master' into patch-2 Shel R 2017-04-07 22:39:59 -04:00
  • c890b86ef6 Merge branch 'master' into patch-2 Shel R 2017-04-07 22:39:59 -04:00
  • 6a74825ce3 Merge branch 'master' into master Valentin Ouvrard 2017-04-08 13:39:31 +11:00
  • 5b571fc434 Merge branch 'master' into master Valentin Ouvrard 2017-04-08 13:39:31 +11:00
  • 28478cbbb5 Merge branch 'master' into master Valentin Ouvrard 2017-04-08 13:39:09 +11:00
  • 3e4eb9c95f Merge branch 'master' into master Valentin Ouvrard 2017-04-08 13:39:09 +11:00
  • f68302585c Merge pull request #1041 from R0ckweb/patch-1 Shel R 2017-04-07 22:39:05 -04:00
  • ceba26d527 Merge pull request #1041 from R0ckweb/patch-1 Shel R 2017-04-07 22:39:05 -04:00
  • 6c6df0020b Merge branch 'master' into patch-1 Shel R 2017-04-07 22:38:37 -04:00
  • 7826b5e93d Merge branch 'master' into patch-1 Shel R 2017-04-07 22:38:37 -04:00
  • 140ef0eaf7 Merge pull request #1036 from wirehack7/patch-1 Shel R 2017-04-07 22:37:51 -04:00
  • fc7b830719 Merge pull request #1036 from wirehack7/patch-1 Shel R 2017-04-07 22:37:51 -04:00
  • e90cdb038e Merge branch 'master' into patch-1 Shel R 2017-04-07 22:35:45 -04:00
  • c945f29e96 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:35:45 -04:00
  • 137b38e0ef Merge pull request #1035 from gfaivre/add-elao-com-instance Shel R 2017-04-07 22:35:08 -04:00
  • 0d4d42dce6 Merge pull request #1035 from gfaivre/add-elao-com-instance Shel R 2017-04-07 22:35:08 -04:00
  • 6bab10e1d3 Merge branch 'master' into add-elao-com-instance Shel R 2017-04-07 22:34:45 -04:00
  • cf03634e74 Merge branch 'master' into add-elao-com-instance Shel R 2017-04-07 22:34:45 -04:00
  • 2c7fce91ca Merge pull request #1030 from derekcecillewis/add-infinimatix.net-instance Shel R 2017-04-07 22:34:10 -04:00
  • 698d74a15f Merge pull request #1030 from derekcecillewis/add-infinimatix.net-instance Shel R 2017-04-07 22:34:10 -04:00
  • 2a9e196ed4 Merge branch 'master' into add-infinimatix.net-instance Shel R 2017-04-07 22:33:40 -04:00
  • d7d165db5b Merge branch 'master' into add-infinimatix.net-instance Shel R 2017-04-07 22:33:40 -04:00
  • 5a7e19b228 Merge pull request #1009 from ngerakines/patch-1 Shel R 2017-04-07 22:25:45 -04:00
  • d7f4300ee3 Merge pull request #1009 from ngerakines/patch-1 Shel R 2017-04-07 22:25:45 -04:00
  • b2892d365b Merge branch 'master' into patch-1 Shel R 2017-04-07 22:23:50 -04:00
  • 7632178300 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:23:50 -04:00
  • 5eaeba4d47 Merge pull request #797 from AndreLewin/master Shel R 2017-04-07 22:21:48 -04:00
  • e4e948a21b Merge pull request #797 from AndreLewin/master Shel R 2017-04-07 22:21:48 -04:00
  • bca873e7a4 Merge branch 'master' into master Shel R 2017-04-07 22:21:21 -04:00
  • fef478781d Merge branch 'master' into master Shel R 2017-04-07 22:21:21 -04:00
  • 740c19f794 Merge pull request #1006 from Ninetailed/master Shel R 2017-04-07 22:18:11 -04:00
  • c1a553d2c2 Merge pull request #1006 from Ninetailed/master Shel R 2017-04-07 22:18:11 -04:00
  • ce4e1fa4b9 Merge branch 'master' into master Shel R 2017-04-07 22:17:53 -04:00
  • 3e8c1a1c36 Merge branch 'master' into master Shel R 2017-04-07 22:17:53 -04:00
  • 37577dbb02 Merge pull request #992 from Eychics/master Shel R 2017-04-07 22:16:49 -04:00
  • 9fd8bbe15c Merge pull request #992 from Eychics/master Shel R 2017-04-07 22:16:49 -04:00
  • 85e1775c8c Merge branch 'master' into master Shel R 2017-04-07 22:15:55 -04:00
  • 1b42f717f2 Merge branch 'master' into master Shel R 2017-04-07 22:15:55 -04:00
  • 62c8a13422 Merge pull request #991 from vladooku/patch-1 Shel R 2017-04-07 22:15:12 -04:00
  • 7004c69204 Merge pull request #991 from vladooku/patch-1 Shel R 2017-04-07 22:15:12 -04:00
  • 09aa32ffa1 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:14:08 -04:00
  • 9981972844 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:14:08 -04:00
  • 1314c9960b Merge pull request #989 from MTNDevelopment/master Shel R 2017-04-07 22:13:34 -04:00
  • 5f61ef2417 Merge pull request #989 from MTNDevelopment/master Shel R 2017-04-07 22:13:34 -04:00
  • 89ac7ef5eb Merge branch 'master' into master Shel R 2017-04-07 22:13:06 -04:00
  • cf13c97cb2 Merge branch 'master' into master Shel R 2017-04-07 22:13:06 -04:00
  • 30272252dc Merge pull request #986 from estuans/patch-2 Shel R 2017-04-07 22:11:55 -04:00
  • 90a408f592 Merge pull request #986 from estuans/patch-2 Shel R 2017-04-07 22:11:55 -04:00
  • 9fed775dcb Merge branch 'master' into patch-2 Shel R 2017-04-07 22:11:24 -04:00
  • 451b7431c9 Merge branch 'master' into patch-2 Shel R 2017-04-07 22:11:24 -04:00
  • d696bc2957 Merge pull request #985 from Motoma/patch-1 Shel R 2017-04-07 22:10:22 -04:00
  • 530725ba3c Merge pull request #985 from Motoma/patch-1 Shel R 2017-04-07 22:10:22 -04:00
  • e08897bb68 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:09:55 -04:00
  • 6efaee30b1 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:09:55 -04:00
  • 08c9cc7554 Merge pull request #982 from foxiehkins/master Shel R 2017-04-07 22:09:15 -04:00
  • 698fe3686a Merge pull request #982 from foxiehkins/master Shel R 2017-04-07 22:09:15 -04:00
  • 996330a013 Merge branch 'master' into master Shel R 2017-04-07 22:08:54 -04:00
  • 05be34a94b Merge branch 'master' into master Shel R 2017-04-07 22:08:54 -04:00
  • 5b39f263a7 Merge pull request #976 from shug0/patch-1 Shel R 2017-04-07 22:06:06 -04:00
  • cb58694a81 Merge pull request #976 from shug0/patch-1 Shel R 2017-04-07 22:06:06 -04:00
  • b7fa20d555 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:05:38 -04:00
  • e51b6bba94 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:05:38 -04:00
  • f236f3c94d Merge pull request #975 from tomfhowe/patch-4 Shel R 2017-04-07 22:03:35 -04:00
  • 7f393a0b68 Merge pull request #975 from tomfhowe/patch-4 Shel R 2017-04-07 22:03:35 -04:00