diff options
| author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2017-02-14 14:51:14 +0100 |
|---|---|---|
| committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2017-02-14 14:51:43 +0100 |
| commit | 313a23ba2bc60bffcc9cf51bf456dd15afe4d566 (patch) | |
| tree | bf80b7a8320937d8d547d452b2c15d7ea644013e /plugin | |
| parent | 909efab7dfa21374f5932b97de234b102b0e721e (diff) | |
| parent | 962c6c133b0860b5ad4d99d9fb36eca625de5b7a (diff) | |
| download | fosdem-2018-presentation-313a23ba2bc60bffcc9cf51bf456dd15afe4d566.tar fosdem-2018-presentation-313a23ba2bc60bffcc9cf51bf456dd15afe4d566.tar.gz | |
merge autoplay conflict #1771
Diffstat (limited to 'plugin')
0 files changed, 0 insertions, 0 deletions