1
0
mirror of https://github.com/schollz/cowyo.git synced 2023-08-10 21:13:00 +03:00
Commit Graph

366 Commits

Author SHA1 Message Date
Zack Scholl
57cda99027 Benchmark for alliterative animal
Former-commit-id: b489e299fe
2017-03-24 07:18:20 -06:00
Zack Scholl
e8959d8923 Require random names to be smaller
Former-commit-id: ec99ac305c
2017-03-24 07:14:34 -06:00
Zack Scholl
9d9918966a History every 60 seconds instead of 1
Former-commit-id: 931a0a7c62
2017-03-24 07:12:09 -06:00
Zack Scholl
05f43196c5 Updated bindata
Former-commit-id: ed458d05d6
2017-03-24 07:10:31 -06:00
Zack Scholl
c35ab4eb4a Improve history UI and non-history route speed
Former-commit-id: 30f3956568
2017-03-24 07:09:41 -06:00
Zack Scholl
5fab2749f9 Add reverse list
Former-commit-id: f45b4f86ca
2017-03-24 06:25:59 -06:00
Zack
da2dcee3fd Version links to latest release
Former-commit-id: 7b096e6013
2017-03-23 21:16:18 -06:00
Zack Scholl
e11baae47c Updated README
Former-commit-id: ce166d8e56
2017-03-23 20:44:01 -06:00
Zack Scholl
035cd7b6d9 Change name
Former-commit-id: b0308589ec
2017-03-23 20:38:33 -06:00
Zack Scholl
7b1ce17506 Show page on menu
Former-commit-id: 3f109f7160
2017-03-23 20:23:06 -06:00
Zack Scholl
14f563572d Print server version on startup
Former-commit-id: 4717d5d066
2017-03-23 20:13:58 -06:00
Zack
5d273c037a Update .travis.yml
Former-commit-id: 25d99852c0
2017-03-23 19:30:24 -06:00
Zack Scholl
dbd1be938e Merge branch 'master' of github.com:schollz/cowyo
Former-commit-id: 25c30e4be6
2017-03-23 19:27:12 -06:00
Zack Scholl
3f98cb7e70 Updated README
Former-commit-id: 3114a70286
2017-03-23 19:26:35 -06:00
Zack
f09cf1b3e9 Update .travis.yml
Former-commit-id: 79c2a1dcbc
2017-03-23 19:26:10 -06:00
Zack Scholl
c9b9032dc9 Updated logo and README
Former-commit-id: 96eb431dfe
2017-03-23 19:23:33 -06:00
Zack
674b39b49a Create .travis.yml
Former-commit-id: b11c754b8e
2017-03-23 19:18:23 -06:00
Zack Scholl
e066ad23cc Allow raw to get locked copy
Former-commit-id: 685117ffd3
2017-03-23 17:47:41 -06:00
Zack Scholl
11b671423c -> Clear done
Former-commit-id: 3f70a86d65
2017-03-23 17:42:20 -06:00
Zack Scholl
82c24f2413 Remove static files that aren't used anymore
Former-commit-id: 1495b6d836c5ba5c1b87bb778bfb85b3073d9fd2 [formerly 438b5d6af9c80b85d036f1ccce5b593a33934dbf] [formerly 331f1f8bd4a19a0639c35e96298bc834fef406a2 [formerly f391d9132ccd146acea91387a2520bec8349c151]]
Former-commit-id: 19c3b9ec3bbe4056e8c4e99f1576d6fd30a27b16 [formerly 7929749a5807f4d866bd7fd4301aa4305b70d7d8]
Former-commit-id: 658645d15e6e200d1e4123eafde15d6bf5efe2cc
Former-commit-id: e182fbbe64
2017-03-23 16:38:29 -06:00
Zack Scholl
fa7ae60d59 Better UI for locking/encrypting
Former-commit-id: a4d999be67331667d085f4d21e76c36248d4de6d [formerly e0ea851e54280d1299e3c8285412b3df421682a7] [formerly 011d5bf0194d46ee5e2f07cb6ef16a28554235b5 [formerly 17f856fdde59ddf045a116cb85af6f7b79f9d4a5]]
Former-commit-id: b8a3b6ed199e3c06aeb6f365e4b05572a28bd852 [formerly 1998dce4d8b98ccd1586748b26d32935c9b3d78d]
Former-commit-id: 81aa00298e9fe22a5017c726b772a4a34dd53acf
Former-commit-id: c71c77fd5c
2017-03-23 16:28:19 -06:00
Zack Scholl
20dd8d4f20 Fix: filenames to lower case before base32
Former-commit-id: 75492d2819399d026bac979cdfdc9ca3b6cf1466 [formerly e32fd7161849a8e11d2b31f27deb04378f9dcbb4] [formerly da830c5c0d0b73548699f6a6341eb55f5afa130f [formerly 7a780609f7276ff3569323beb61cb12088e17447]]
Former-commit-id: a9a517909321225859867f0b031b8303d35102ae [formerly 59d8c184f6f6359f811b1413b259a01aaee93854]
Former-commit-id: f31efaed6d2b7175ea50f8205ae2fae034163518
Former-commit-id: fc6a38f047
2017-03-23 16:24:25 -06:00
Zack Scholl
bd3b9c96e1 Clean up UI
Former-commit-id: 15a1200308fe75f9c3163d400ff3c56287492dfb [formerly 79f3f90c3d0e620372f1ad338252a988135b302e] [formerly 3d62c398b3487e92160d35a200c08134fcf4eb32 [formerly 52370dde7adf6c4fe9899544567a2469c03b031a]]
Former-commit-id: bbe42ca94a0e072215e5fef3f163add591206ab2 [formerly df5785bc10f23dab6110d38900a55946d95f0fce]
Former-commit-id: 4c02db90005227a23605f2a46d6546ab3f698a99
Former-commit-id: a456b44b5a
2017-03-23 16:16:15 -06:00
Zack Scholl
a78468e086 Makefile works in parallel
Former-commit-id: 0e8b4a8544a37d5ba70b5105972af6f682121fe2 [formerly b27e6f754cf6267f4d9b24e4e16d719b1b58ac3a] [formerly 643edb8efb9bb54ffe343f6d8e09d70277ba8880 [formerly d064c67547da6da2f97431f2962dd6a6f81cb8ce]]
Former-commit-id: de0f0fadefb349b5fef99655c574515dde046c44 [formerly 471f13c019582eff335fef36b8602308e9bfd06d]
Former-commit-id: db630b02ebee07b2f95eff560f6ff0e74152413e
Former-commit-id: ebfdb06f25
2017-03-23 14:37:47 -06:00
Zack Scholl
97bfc15692 Remove goreleaser
Former-commit-id: 4917070ce632a6cedf0b5b3c4a2cf45aa4bbb271 [formerly 98fa8a9d297a2786d332f22ac77eb53e43b43f0c] [formerly f0bbeb242e7615e4784f3898b97b7555e134868b [formerly d1dc4804ad9e5a7e57e9f112c9bd7ab98564ae4f]]
Former-commit-id: de57b86dde4c6d5bde9eb211a6755966a95d64ee [formerly 395bc843211b4c46410c62f9525f9e43527e8dfd]
Former-commit-id: 04e6b16e8658bb4caeee788651bfad6da0e4e36c
Former-commit-id: f1abfbe858
2017-03-23 14:18:58 -06:00
Zack Scholl
61b8d275be Update goreleaser
Former-commit-id: 30888d69957a68dd8a3fe025bb90a671135c011a [formerly 64906e29fda1a6da209155a2572cecd3cd4ab639] [formerly d6d932dab5bd2bdb4e7a78b0229fc21c29dd76af [formerly a9b194fe32d668683d3099286d5079773fdff3e6]]
Former-commit-id: d8684df40761e41ba6a08e5caf025ee652bd7d8c [formerly f4827b3cfd5a561865df53ce8246e8c412c0a202]
Former-commit-id: dca71837f3bffdab7c9374a47536a16e72eb2013
Former-commit-id: 752902466e
2017-03-23 14:15:30 -06:00
Zack Scholl
3b7e35f9ef Add "Clear old" for deleting crossed list items
Former-commit-id: f43b6caae264ef5f8cd46f8a40143501a39d5948 [formerly 328a9724705837f8287a6d519578513fb868c962] [formerly b006fff403bdf2421495a4d4e8f9ef246e15adec [formerly fb4118be424a81a90072ad987c886af08923917a]]
Former-commit-id: da4974f66bfcea8602d9b08f129b73ba06d69ea8 [formerly 8215c6a461f8bd2a9baee02176e64ec99a401ec9]
Former-commit-id: 4e070f07eef46a9f140a778dca7dc6c20adc76d5
Former-commit-id: 2980f1e193
2017-03-23 13:31:09 -06:00
Zack Scholl
bbf55f539f Use monospace when editing a file
Files are determined if they have a period in the name.


Former-commit-id: 8ae103ccf40f20a2c0a385021fad70caf614ca51 [formerly 23e44beb2ececa617280feb256a94900342cbdc4] [formerly 4872f2c5eaa25e32514c01aabd63355e6cb1d5d4 [formerly 518ee34f5615b9c9a6e3b5b68322df2c8a221ae8]]
Former-commit-id: c646c3b38b5cf7d2552f9aac8d1802ef98e9170b [formerly 71bb4f2d64a0c87f9b881e612091ec98253721fa]
Former-commit-id: a60d4c8180b584dea243391a7a41abc175524afb
Former-commit-id: 5f42c319a2
2017-03-23 13:13:56 -06:00
Zack Scholl
28d70b6148 New: release with goreleaser
Former-commit-id: 0714de93b3df45312d65ed61340b066515d10bae [formerly 23a3da72fd9edd64da8b30b0ead05ca4c440c709] [formerly 01d2da8eb8e0b9e5fba12ed5cc92e50c29aa9be6 [formerly 838f599daae4e00ea0f2bace01ddd8521f28a157]]
Former-commit-id: 73bb360a0b18b0ad1b626b5a29a6e2e188b91257 [formerly 104088fcf4e6880a40436c7ff309747baea2640e]
Former-commit-id: ffbc185e61ad872f99713d15289fc07b14bbaf80
Former-commit-id: b69ddc7cdb
2017-03-23 11:59:55 -06:00
Zack Scholl
3b0169212c Update bin
Former-commit-id: 8383f8425cd42c2ccf34e992019a7c84c033e0c9 [formerly 0aed9dbed69ff4e95429f8638101252a0f962776] [formerly a25974ec2c0f768eab091fb2c64de4138834a110 [formerly 1a3fa54b60fd2a38cdc6833e2d48fcf5f2793046]]
Former-commit-id: 185dddc3245f701da416c1437d3bb59fa7d57e55 [formerly c4ea403af36b85707ebf2f30d22edde4e77d6e06]
Former-commit-id: ab8139e0438e552531a7f86e1116d40cda905752
Former-commit-id: caa85d22af
2017-03-23 10:57:31 -06:00
Zack Scholl
90faae9e85 Add link for view/raw/list
Former-commit-id: 288ff9cd595b174372f32c928082cea7d7983fe3 [formerly c40384353290006486b9c7f9c94f07f7b0378a6c] [formerly c79385490b081fa4878526f946dc6861b428829d [formerly c4906b78767ae66904d8dd1e3ee53351797d20ad]]
Former-commit-id: 9691087d6cf38d30829d0b9d5e9af9e2469607d1 [formerly 781213c951e51a1d3fe61421b0526329e84d4eb8]
Former-commit-id: f933ace45d149daed95cb00b19abf4f1f418ec87
Former-commit-id: 41666f1238
2017-03-23 10:57:14 -06:00
Zack Scholl
e9e513171c Create special folder for tests
Former-commit-id: ae51c6c248baaf996f899e77e760aba1f0c161cf [formerly 7bf4f38602dd6b24f7888d88f18ca6e9cac9b9a3] [formerly 0ef00a42149f4e7724fde45c2a252e9ec7c550f5 [formerly d20e40ca85e6a06d0aba698624e3433e7c5c612a]]
Former-commit-id: 69b97c02f08943de02a1ae58c8291dcae6c56db8 [formerly d229497f2b2159c144939054ad21f57ce380c47e]
Former-commit-id: 3951a8763debafee5f9ddf812fd022c9b5ce2d10
Former-commit-id: 4a1c502ee3
2017-03-23 10:56:53 -06:00
Zack Scholl
bd6ed8d3c0 Keep messaging system alive when locked/encrypted
Former-commit-id: becceb5fed276d2daa80eca4a41b9fa9d3eae9fd [formerly 4ac3d85f084df155b06e17eea289e34ea60faa50] [formerly 19561726e85e6c133c667d1ee948b0ff2978632d [formerly a3fe621f1947a2cf0b6af4ac6ccb01c3c744fc2e]]
Former-commit-id: 3b7092e62e255f90d4ddcea9a104f5e6db22da2e [formerly 0dd41c8f221df6a21fad9da2ff2287ebb98f3b9a]
Former-commit-id: 62a685d81f08d7b96596cbc236c540141cdd9e42
Former-commit-id: 4b75f66381
2017-03-23 10:39:14 -06:00
Zack Scholl
c1b9b71669 Remove menu options when locking/encrypting
Former-commit-id: 9020d91d5e3f4ab07cc5ec8e5abfc68d7f30cc05 [formerly c501c57e329676731abd211e6f26619806db2bc6] [formerly 8c7c7f37bb87845da3af2e1a40ccf5bf73852846 [formerly 13d370370f4f68203998d8eee7ebacec61a6a2a6]]
Former-commit-id: da6da64e8940ef34512f9abc8ed5480a9d132a64 [formerly 6902d14822e41218409d23c5e8669afa370e1fb9]
Former-commit-id: a02186b53b69eff7a51d8cb61e9af0470113e7df
Former-commit-id: 078801ce85
2017-03-23 10:26:40 -06:00
Zack
edcd2e7d09 Merge pull request #61 from schollz/frontend
Update frontend for locking page

Former-commit-id: 6c657ff4a43f33cb040185d259c03e793676f332 [formerly 72b937774f347af8f114d919bcc260c1c441ced7] [formerly 9429791652dc3e9a3e44d866dc346a45225e5560 [formerly c5fa54646d56b3eaebfef06aff2821b1839a39cc]]
Former-commit-id: 182ba5b59c9852b46a80f7215a7113a640e11ef7 [formerly 4a66a0a6bce4d892bcef1eb00d074ddcd025b425]
Former-commit-id: e6fdc1362ec4b3d22195a9c7b2874010dfda4a36
Former-commit-id: 695b838991
2017-03-23 10:03:45 -06:00
Zack Scholl
3fd886e625 Update frontend for locking page
Former-commit-id: e7a41b6d0ef9fc0814b4f6fa378370a2dc94749b [formerly 54b793d738e5deb2ebf2e8316a1f43e3450900aa] [formerly 842e120f0f69713229f4227bd90f8c33ce2932b3 [formerly 9c95fd350104dd20055c7564fc5e167e21409c38 [formerly b9860a5d2f]]]
Former-commit-id: 3d6c223179053689aa785e50ba1a6d7affd075aa [formerly 61ab106b098ea088e70597cb1a5a19e3a71eced9]
Former-commit-id: ab5ef985f31336a09d0a6d9dd7291967ea4da3f0
Former-commit-id: a7f6cd8a0e
2017-03-23 09:57:25 -06:00
Zack Scholl
4709654c4c Version bump
Former-commit-id: 9e36c6e26026b6da693e9c63665a359bd8f81132 [formerly 90d2930802e405e495c9d4f115fc96607240fa8d] [formerly 384133006e5622b83245917ca698c6678728be97 [formerly dcf6fd4e981e1eec2f77ba5e3de39ee40253d73f [formerly 59036904d8]]]
Former-commit-id: 73ead65f17e5bc8e72002d3db704f31e66d4bf37 [formerly 123a60c023445bb54818026f4ea8bd8683c4846a]
Former-commit-id: 8637b59aaedf6f665c581a630f8e076c2e38b735
Former-commit-id: ef0414a548
2017-03-23 07:55:36 -06:00
Zack Scholl
cc04599b6f Update bindata on Makefile
Former-commit-id: eb5f6d3dcc38157ddff43ab777962555c20d2b16 [formerly 4d02759fbb3a7f208a178c0cd797437300b9feb0] [formerly d68e70cde8da577d49b4ec1116c7948e792d80c0 [formerly 98d57a49c87b73fd59680fda968e16b2a4a94296 [formerly 8f76fbecf4]]]
Former-commit-id: 75cf27c8d4bb198da60f59548a3ed846c8529c7d [formerly e05a48d24612a7bd8994e7c51d68ee2ca46e8736]
Former-commit-id: 530053a77d420a205f65fd9ead96b656b523b766
Former-commit-id: 72b285671b
2017-03-23 07:40:47 -06:00
Zack Scholl
d247846934 Add ARM to makefile
Former-commit-id: a4ad6c9c132f48b5f679f973a0c80db923765156 [formerly 0635361632881f2e831e3ecea20134df27838d9e] [formerly 2d91ad2c4766984722e88d20275d0105218b1145 [formerly 2549aac8215b9213a2f8c7b9387f3081a5c1bc04 [formerly 2a2570835d]]]
Former-commit-id: d5459ec2b879c7b5ea69361643fdc6e1a5857114 [formerly 63abe22d8706168f9a7f035f53585d7d58b654f3]
Former-commit-id: 2326e71c3063d2bbee54839dadd8c57484a90835
Former-commit-id: cf04407182
2017-03-23 07:33:46 -06:00
Zack Scholl
79768ce9be Updated bindata
Former-commit-id: b54ce6344bd46fc6f82ff1e4fb676dc425d99680 [formerly 0fa45573d6b17c6e1566e7a1ab7f56f437759625] [formerly 9fe8f5b04b0f415c74ee52f171f1378c2834d7b5 [formerly 3c86cbfc68d699bf79fe05d513d0a0e0aa00ed7c [formerly 6440472b2d]]]
Former-commit-id: 4f471e841a3022e0dc3999b4ff450b82870859e5 [formerly 05232e825e9c05340760432ac53a29661d596380]
Former-commit-id: 3f607ad0c09546f775fed460ebcde58dfa3afa23
Former-commit-id: 88bfd0a1f7
2017-03-23 07:33:13 -06:00
Zack Scholl
a16fd6f8fb Show error message if route not understood
Former-commit-id: a8f0c8962f4bfc694d883a6c6162dac512dce40d [formerly a1a3744bd736baaf6af702e1635089a29a87ac8a] [formerly bd72fb7c08e2efda8ab97fc7d8a57b0d50ef43d2 [formerly c1b05ff1b8a28f4067785b8b2d0e8e68b325d0db [formerly 4193da80fc]]]
Former-commit-id: 8686c6cfb26ca2542efe1aeca186093320c12228 [formerly 6ffcbe6472aa192fd8f59faace2c87fd08225b3d]
Former-commit-id: e726d4a1d3b075389f1a652198b45c2c7ce8ab5a
Former-commit-id: 526a97affb
2017-03-23 07:33:00 -06:00
Zack Scholl
62c9e6ee1b Simplify routes, handle error route
Former-commit-id: a2be41df36132865f1f5ddee954a2c36cd15946a [formerly 952889d5fec4f3207cfd3a071bcf7278afeb09a8] [formerly 21c56db9a4a329ff6e70573734bbe7a33ee8b0a0 [formerly 8f4f07ce580467b241015b8b6291d7bce91bf66e [formerly 9becf07745]]]
Former-commit-id: 1ad7a875ff4738230e09a4d46bf58c7d03c43a90 [formerly 5263a10dd6b8057bcfa7ac65509c7a87d5889175]
Former-commit-id: 57c32446567ef6b8d219893ed93c6499cf0b0da8
Former-commit-id: 95afa389bc
2017-03-23 07:32:40 -06:00
Zack Scholl
3a265a0979 Update GetMajorSnapshots API
Former-commit-id: eafad64cf835e69fa4994dd2173287eb68a49975 [formerly 7c91b825f33c0deea8a4b26419c3395fe1d9ff69] [formerly 4fdb4a30274e2028f13bf89b37b678a208118b58 [formerly 6e7d202e7b38b8a6d14f7824971b3acd28807906 [formerly 3a29cc5adf]]]
Former-commit-id: f131365c5c22dc159510a1c837dd26e8c8b9e06f [formerly 10b24d4adb33a566fb1e1e76d19d5af677d7ad38]
Former-commit-id: 1b0096a9d5b26ea2f6492394e7b7cbee944e1fa1
Former-commit-id: 3781c6457e
2017-03-23 07:22:14 -06:00
Zack Scholl
39ebd6c125 Get major versions instead of all
Former-commit-id: 5cdd8a3b23c05604fa82d5ba3319ec8caf402313 [formerly d0acfb7a8b73c1549cb8a3814583dbacd0833b27] [formerly 60213b204673cd65c02b6945df1883ca0f348aa7 [formerly c2c93edebbabde3fd2ec773cc4fdf6ad0fba868c [formerly 80610690ea]]]
Former-commit-id: f783c78d0353eec3003fbe3fab6854a4ef5e761a [formerly 69e182e4f7a83e76eaa52d3a494760e715fe4abc]
Former-commit-id: d1c6e0fcf474c14ab15a5148fdd4531462ce6702
Former-commit-id: 3886f3d00e
2017-03-23 07:17:44 -06:00
Zack Scholl
bd85204eff Bump version in Makefile
Former-commit-id: 456a4137adadb4044e720f04ac8ec6ab7b3d80d6 [formerly 12de613c2e4c46aca255f15f04e9b2819e51f2a0] [formerly 64bc5f9527ec3babaeade20a5601cf43a6b239a4 [formerly 3168d427d4b6f85a2caedae527a2f78a13988db3 [formerly c8e237c3c5]]]
Former-commit-id: 70bc9dc28a3c99506768567cb4f2eb1a9479c393 [formerly 687f78214d9de740f9e4492cd2d383bcbd0da2c4]
Former-commit-id: dad5e45520f127757318cc867f2013492aeb3501
Former-commit-id: 7b0bfea196
2017-03-22 21:43:47 -06:00
Zack Scholl
322294b2ac Normalize filenames when writing
Former-commit-id: 84c13ae6f2f058709c59c3bc3cd3bce41cfc580c [formerly d0200cc718af544ea6d809207ee496b9234d76cb] [formerly 31012f0ebf56f4e7fd142b658aaa32645f743a72 [formerly 7d92efd3cd8ce550304eda03518515f57b99a376 [formerly a3d1b822e4]]]
Former-commit-id: ca2c13ab6848c86deb1a7b432e564c21c29e1007 [formerly af1fd98d479fac25cef74f522d2467f9ee582132]
Former-commit-id: e47d01d1ef3f59d7b4acaef5d74965d4e2e40adb
Former-commit-id: 0136d5d640
2017-03-22 21:22:26 -06:00
Zack Scholl
1686409cf7 Update README
Former-commit-id: 63039d0d361bb3af1243938b34024e3c7fb62c79 [formerly b833b75dccaf7b5c43945dc0e46eb0dbf9b747c5] [formerly 873059f5bca74f3d134969ffd8dd1f1abc17d058 [formerly aea5747e7a2eff250dc8d565b12e4c82fbfc61d7 [formerly f2b317be8b]]]
Former-commit-id: aa7719891c68c0e3c9432ad2053d3e3154768899 [formerly 8e005b32f106cd9870e771591310c40d89be56eb]
Former-commit-id: 8d01eea63586af137fbef2013331de8a915ce261
Former-commit-id: 192cb9f0bc
2017-03-22 21:11:20 -06:00
Zack Scholl
0109a94cbb Add logo
Former-commit-id: afb41ca8dd353e4ed932a958b4f734c74dd5b927 [formerly 5c23e3e9a78afcb30517cf5cb18c0063fb343cd6] [formerly 5a098bcf34598737f50ad25676b8f3869cd0a27c [formerly 2c14b97b390ec8a77eaad49f237d4ba0f2b7d433 [formerly 25c01cf1f6]]]
Former-commit-id: 71a7802cffe269f17d79a761ef6ecd9af696bc16 [formerly 2becefe0ced4277410e8a39d093a140387f9319c]
Former-commit-id: 52505e15a9f264a75166d9a66f8a5445bde7dd7e
Former-commit-id: 3221ee0cae
2017-03-22 21:09:32 -06:00
Zack Scholl
17bf3c3a4c Updated README
Former-commit-id: 4550d3d46e3fd08d1f62ff42b3c74a029e3ba7e3 [formerly 57b84131f2a4d6f2dbdd878f5af4da442e4995be] [formerly e893072497705cc6311192fa763fbc5353292bb3 [formerly 0b785d77b5362bcec7fba5281447850e5484b09e [formerly 405bc46958]]]
Former-commit-id: 83fa42e2070637493214e282c6de4cda688b850f [formerly a0149f30c14d82e1123f23587241a3e34843822a]
Former-commit-id: 373c765a77beb16837994661ecd613ecdc84190e
Former-commit-id: 9e7641df3c
2017-03-22 21:06:14 -06:00
Zack Scholl
cbede33317 Merge branch 'v2-master'
Former-commit-id: 18ae04b11d6cbb3927d58732515fc1db6959708f [formerly 7d140d3d7ca7225021516cd778f4b00a2f16eae6] [formerly fd6b7171287b7a55d486cf6ee4b014736c4cdaf0 [formerly 646c41cc7eb60cf2139b7e29562b20f951168bb4 [formerly 1c7524cc45]]]
Former-commit-id: 8146d635fb76f7d156a198877c4a3cd2f76334cf [formerly e541056fe056ca9cbf07fb2008ced91524f0ef6d]
Former-commit-id: b4f71c483d27fad2e8869e77149ca8b682baa085
Former-commit-id: 5540875d62
2017-03-22 20:56:47 -06:00