diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-11-25 09:25:51 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-11-25 09:25:51 +0900 |
| commit | cc2786c84e048123e4bce40cf4ea06ac172de5a4 (patch) | |
| tree | 302461ab1ffd553429d0e952815030d065ac9e59 /mruby-source.gemspec | |
| parent | 0d48a9786f9202f4890df53682117429b9350516 (diff) | |
| parent | 12539825773ddb13fac38091d13341b816ac23fa (diff) | |
| download | mruby-cc2786c84e048123e4bce40cf4ea06ac172de5a4.tar.gz mruby-cc2786c84e048123e4bce40cf4ea06ac172de5a4.zip | |
resolve conflict; ref #3285
Diffstat (limited to 'mruby-source.gemspec')
0 files changed, 0 insertions, 0 deletions