Artur Paikin 0aa73eef48 Merge branch 'master' into i18n ... # Conflicts: # website/_config.yml		2016-01-07 23:38:34 -05:00
..
assets	Merge	2015-11-27 12:27:48 +03:00
private_modules/hexo-renderer-uppyexamples	Less verbose example rendering	2015-12-18 09:57:55 +01:00
src	Merge branch 'master' into i18n	2016-01-07 23:38:34 -05:00
themes/uppy	Refactoring, improvements and cleanup	2016-01-03 13:20:03 -05:00
_config.yml	Merge branch 'master' into i18n	2016-01-07 23:38:34 -05:00
build-examples.js	We'll need a real renderer, otherwise Hexo deletes artifacts in one-off builds	2015-12-17 16:55:10 +01:00
documentation.js	Refactoring, improvements and cleanup	2016-01-03 13:20:03 -05:00
package.json	Improved docs generator	2015-12-26 00:37:39 -05:00
update.js	Reflect uppy.css dist changes in website	2015-12-18 13:37:58 +01:00
VUEORG_LICENSE	Rename LICENSE to VUE	2015-11-29 14:22:03 +01:00