gogs/UPGRADE-NOTES/git-status

$ git status
On branch merge-upstream
You have unmerged paths.
  (fix conflicts and run "git commit")

Changes to be committed:

	modified:   .bra.toml
	new file:   .dockerignore
	new file:   .gitattributes
	new file:   .github/CONTRIBUTING.md
	new file:   .github/ISSUE_TEMPLATE.md
	new file:   .github/PULL_REQUEST_TEMPLATE.md
	modified:   .gopmfile
	modified:   .pkgr.yml
	modified:   .travis.yml
	deleted:    CONTRIBUTING.md
	modified:   Dockerfile
	new file:   Dockerfile.rpi
	new file:   Makefile
	modified:   README.md
	modified:   README_ZH.md
	modified:   cmd/cert.go
	modified:   cmd/cert_stub.go
	new file:   cmd/cmd.go
	modified:   cmd/dump.go
	modified:   cmd/serve.go
	modified:   cmd/update.go
	deleted:    conf/README
	new file:   conf/README.md
	modified:   conf/app.ini
	new file:   conf/gitignore/Actionscript
	new file:   conf/gitignore/Ada
	new file:   conf/gitignore/Agda
	modified:   conf/gitignore/Android
	new file:   conf/gitignore/Anjuta
	new file:   conf/gitignore/AppEngine
	new file:   conf/gitignore/AppceleratorTitanium
	new file:   conf/gitignore/ArchLinuxPackages
	new file:   conf/gitignore/Archives
	new file:   conf/gitignore/Autotools
	new file:   conf/gitignore/BricxCC
	modified:   conf/gitignore/C
	modified:   conf/gitignore/C Sharp
	modified:   conf/gitignore/C++
	new file:   conf/gitignore/CFWheels
	new file:   conf/gitignore/CMake
	new file:   conf/gitignore/CUDA
	new file:   conf/gitignore/CVS
	new file:   conf/gitignore/CakePHP
	new file:   conf/gitignore/ChefCookbook
	new file:   conf/gitignore/Cloud9
	new file:   conf/gitignore/CodeIgniter
	new file:   conf/gitignore/CodeKit
	new file:   conf/gitignore/CommonLisp
	new file:   conf/gitignore/Composer
	new file:   conf/gitignore/Concrete5
	new file:   conf/gitignore/Coq
	new file:   conf/gitignore/CraftCMS
	new file:   conf/gitignore/DM
	new file:   conf/gitignore/Dart
	new file:   conf/gitignore/DartEditor
	new file:   conf/gitignore/Delphi
	new file:   conf/gitignore/Dreamweaver
	new file:   conf/gitignore/Drupal
	new file:   conf/gitignore/EPiServer
	new file:   conf/gitignore/Eagle
	new file:   conf/gitignore/Eclipse
	new file:   conf/gitignore/EiffelStudio
	new file:   conf/gitignore/Elisp
	new file:   conf/gitignore/Elixir
	new file:   conf/gitignore/Emacs
	new file:   conf/gitignore/Ensime
	new file:   conf/gitignore/Erlang
	new file:   conf/gitignore/Espresso
	new file:   conf/gitignore/ExpressionEngine
	new file:   conf/gitignore/ExtJs
	new file:   conf/gitignore/Fancy
	new file:   conf/gitignore/Finale
	new file:   conf/gitignore/FlexBuilder
	new file:   conf/gitignore/ForceDotCom
	new file:   conf/gitignore/FuelPHP
	new file:   conf/gitignore/GWT
	new file:   conf/gitignore/Gcov
	new file:   conf/gitignore/GitBook
	new file:   conf/gitignore/Go
	deleted:    conf/gitignore/Google Go
	new file:   conf/gitignore/Gradle
	new file:   conf/gitignore/Grails
	new file:   conf/gitignore/Haskell
	new file:   conf/gitignore/IGORPro
	new file:   conf/gitignore/IPythonNotebook
	new file:   conf/gitignore/Idris
	new file:   conf/gitignore/JDeveloper
	modified:   conf/gitignore/Java
	new file:   conf/gitignore/Jboss
	new file:   conf/gitignore/Jekyll
	new file:   conf/gitignore/JetBrains
	new file:   conf/gitignore/Joomla
	new file:   conf/gitignore/KDevelop4
	new file:   conf/gitignore/Kate
	new file:   conf/gitignore/KiCAD
	new file:   conf/gitignore/Kohana
	new file:   conf/gitignore/LabVIEW
	new file:   conf/gitignore/Laravel
	new file:   conf/gitignore/Lazarus
	new file:   conf/gitignore/Leiningen
	new file:   conf/gitignore/LemonStand
	new file:   conf/gitignore/LibreOffice
	new file:   conf/gitignore/Lilypond
	new file:   conf/gitignore/Linux
	new file:   conf/gitignore/Lithium
	new file:   conf/gitignore/Lua
	new file:   conf/gitignore/LyX
	new file:   conf/gitignore/Magento
	new file:   conf/gitignore/Matlab
	new file:   conf/gitignore/Maven
	new file:   conf/gitignore/Mercurial
	new file:   conf/gitignore/Mercury
	new file:   conf/gitignore/MetaProgrammingSystem
	new file:   conf/gitignore/MicrosoftOffice
	new file:   conf/gitignore/ModelSim
	new file:   conf/gitignore/Momentics
	new file:   conf/gitignore/MonoDevelop
	new file:   conf/gitignore/Nanoc
	new file:   conf/gitignore/NetBeans
	new file:   conf/gitignore/Nim
	new file:   conf/gitignore/Ninja
	new file:   conf/gitignore/Node
	new file:   conf/gitignore/NotepadPP
	new file:   conf/gitignore/OCaml
	new file:   conf/gitignore/OSX
	modified:   conf/gitignore/Objective-C
	new file:   conf/gitignore/Opa
	new file:   conf/gitignore/OpenCart
	new file:   conf/gitignore/OracleForms
	new file:   conf/gitignore/Packer
	new file:   conf/gitignore/Perl
	new file:   conf/gitignore/Phalcon
	new file:   conf/gitignore/PlayFramework
	new file:   conf/gitignore/Plone
	new file:   conf/gitignore/Prestashop
	new file:   conf/gitignore/Processing
	modified:   conf/gitignore/Python
	new file:   conf/gitignore/Qooxdoo
	new file:   conf/gitignore/Qt
	new file:   conf/gitignore/R
	new file:   conf/gitignore/ROS
	new file:   conf/gitignore/Rails
	new file:   conf/gitignore/Redcar
	new file:   conf/gitignore/Redis
	new file:   conf/gitignore/RhodesRhomobile
	modified:   conf/gitignore/Ruby
	new file:   conf/gitignore/Rust
	new file:   conf/gitignore/SBT
	new file:   conf/gitignore/SCons
	new file:   conf/gitignore/SVN
	new file:   conf/gitignore/Sass
	new file:   conf/gitignore/Scala
	new file:   conf/gitignore/Scrivener
	new file:   conf/gitignore/Sdcc
	new file:   conf/gitignore/SeamGen
	new file:   conf/gitignore/SketchUp
	new file:   conf/gitignore/SlickEdit
	new file:   conf/gitignore/Stella
	new file:   conf/gitignore/SublimeText
	new file:   conf/gitignore/SugarCRM
	new file:   conf/gitignore/Swift
	new file:   conf/gitignore/Symfony
	new file:   conf/gitignore/SymphonyCMS
	new file:   conf/gitignore/SynopsysVCS
	new file:   conf/gitignore/Tags
	new file:   conf/gitignore/TeX
	new file:   conf/gitignore/TextMate
	new file:   conf/gitignore/Textpattern
	new file:   conf/gitignore/TortoiseGit
	new file:   conf/gitignore/TurboGears2
	new file:   conf/gitignore/Typo3
	new file:   conf/gitignore/Umbraco
	new file:   conf/gitignore/Unity
	new file:   conf/gitignore/VVVV
	new file:   conf/gitignore/Vagrant
	new file:   conf/gitignore/Vim
	new file:   conf/gitignore/VirtualEnv
	new file:   conf/gitignore/VisualStudio
	new file:   conf/gitignore/VisualStudioCode
	new file:   conf/gitignore/Waf
	new file:   conf/gitignore/WebMethods
	new file:   conf/gitignore/Windows
	new file:   conf/gitignore/WordPress
	new file:   conf/gitignore/Xcode
	new file:   conf/gitignore/XilinxISE
	new file:   conf/gitignore/Xojo
	new file:   conf/gitignore/Yeoman
	new file:   conf/gitignore/Yii
	new file:   conf/gitignore/ZendFramework
	new file:   conf/gitignore/Zephir
	new file:   conf/license/Abstyles License
	new file:   conf/license/Academic Free License v1.1
	new file:   conf/license/Academic Free License v1.2
	new file:   conf/license/Academic Free License v2.0
	new file:   conf/license/Academic Free License v2.1
	new file:   conf/license/Academic Free License v3.0
	deleted:    conf/license/Affero GPL
	new file:   conf/license/Affero General Public License v1.0
	new file:   conf/license/Apache License 1.0
	new file:   conf/license/Apache License 1.1
	new file:   conf/license/Apache License 2.0
	deleted:    conf/license/Apache v2 License
	new file:   conf/license/Artistic License 1.0
	modified:   conf/license/Artistic License 2.0
	deleted:    conf/license/BSD (3-Clause) License
	new file:   conf/license/BSD 2-clause License
	new file:   conf/license/BSD 3-clause License
	new file:   conf/license/BSD 4-clause License
	deleted:    conf/license/BSD license
	deleted:    conf/license/CC0 1.0 Universal
	new file:   conf/license/Creative Commons CC0 1.0 Universal
	new file:   conf/license/Eclipse Public License 1.0
	deleted:    conf/license/Eclipse Public License v1.0
	new file:   conf/license/Educational Community License v1.0
	new file:   conf/license/Educational Community License v2.0
	new file:   conf/license/GNU Affero General Public License v3.0
	new file:   conf/license/GNU Free Documentation License v1.1
	new file:   conf/license/GNU Free Documentation License v1.2
	new file:   conf/license/GNU Free Documentation License v1.3
	new file:   conf/license/GNU General Public License v1.0
	new file:   conf/license/GNU General Public License v2.0
	new file:   conf/license/GNU General Public License v3.0
	new file:   conf/license/GNU Lesser General Public License v2.1
	new file:   conf/license/GNU Lesser General Public License v3.0
	new file:   conf/license/GNU Library General Public License v2.0
	deleted:    conf/license/GPL v2
	deleted:    conf/license/GPL v3
	modified:   conf/license/ISC license
	deleted:    conf/license/LGPL v2.1
	deleted:    conf/license/LGPL v3
	modified:   conf/license/MIT License
	new file:   conf/license/Mozilla Public License 1.0
	new file:   conf/license/Mozilla Public License 1.1
	new file:   conf/license/Mozilla Public License 2.0
	deleted:    conf/license/Mozilla Public License Version 2.0
	modified:   conf/locale/TRANSLATORS
	new file:   conf/locale/locale_bg-BG.ini
	new file:   conf/locale/locale_cs-CZ.ini
	modified:   conf/locale/locale_de-DE.ini
	modified:   conf/locale/locale_en-US.ini
	modified:   conf/locale/locale_es-ES.ini
	new file:   conf/locale/locale_fi-FI.ini
	modified:   conf/locale/locale_fr-FR.ini
	new file:   conf/locale/locale_it-IT.ini
	modified:   conf/locale/locale_ja-JP.ini
	modified:   conf/locale/locale_lv-LV.ini
	modified:   conf/locale/locale_nl-NL.ini
	modified:   conf/locale/locale_pl-PL.ini
	modified:   conf/locale/locale_pt-BR.ini
	modified:   conf/locale/locale_ru-RU.ini
	new file:   conf/locale/locale_tr-TR.ini
	modified:   conf/locale/locale_zh-CN.ini
	modified:   conf/locale/locale_zh-HK.ini
	new file:   conf/locale/locale_zh-TW.ini
	new file:   conf/readme/Default
	deleted:    docker-compose.yml
	modified:   docker/README.md
	deleted:    docker/assemble_blocks.sh
	deleted:    docker/blocks/docker_gogs/Dockerfile
	deleted:    docker/blocks/docker_gogs_dev/Dockerfile
	deleted:    docker/blocks/option_cache_memcache/config
	deleted:    docker/blocks/option_cache_memcache/fig
	deleted:    docker/blocks/option_cache_redis/config
	deleted:    docker/blocks/option_cache_redis/fig
	deleted:    docker/blocks/option_db_mysql/config
	deleted:    docker/blocks/option_db_mysql/fig
	deleted:    docker/blocks/option_db_postgresql/config
	deleted:    docker/blocks/option_db_postgresql/fig
	deleted:    docker/blocks/option_session_mysql/config
	deleted:    docker/blocks/option_session_mysql/fig
	deleted:    docker/blocks/w_cache/fig
	deleted:    docker/blocks/w_cache_session/fig
	deleted:    docker/blocks/w_db/fig
	deleted:    docker/blocks/w_db_cache/fig
	deleted:    docker/blocks/w_db_cache_session/fig
	deleted:    docker/blocks/w_db_session/fig
	deleted:    docker/blocks/w_none/fig
	deleted:    docker/blocks/w_session/fig
	new file:   docker/build.sh
	new file:   docker/nsswitch.conf
	new file:   docker/s6/.s6-svscan/finish
	renamed:    docker/docker/.gitkeep -> docker/s6/crond/down
	new file:   docker/s6/crond/run
	new file:   docker/s6/gogs/run
	new file:   docker/s6/gogs/setup
	new file:   docker/s6/openssh/run
	new file:   docker/s6/openssh/setup
	new file:   docker/s6/syslogd/run
	new file:   docker/sshd_config
	new file:   docker/start.sh
	deleted:    docker/templates/init_gogs.sh.tpl
	deleted:    etc/mysql.sql
	deleted:    etc/supervisord.conf
	new file:   glide.lock
	new file:   glide.yaml
	modified:   gogs.go
	modified:   models/access.go
	modified:   models/action.go
	modified:   models/admin.go
	modified:   models/error.go
	modified:   models/git_diff.go
	new file:   models/git_diff_test.go
	new file:   models/issue_comment.go
	new file:   models/issue_label.go
	new file:   models/issue_mail.go
	modified:   models/login.go
	new file:   models/mail.go
	modified:   models/migrations/migrations.go
	new file:   models/migrations/v13.go
	modified:   models/models.go
	new file:   models/models_tidb.go
	deleted:    models/oauth2.go
	modified:   models/org.go
	new file:   models/org_team.go
	deleted:    models/publickey.go
	new file:   models/pull.go
	modified:   models/release.go
	new file:   models/repo_branch.go
	new file:   models/repo_collaboration.go
	new file:   models/repo_test.go
	deleted:    models/slack.go
	new file:   models/ssh_key.go
	new file:   models/ssh_key_test.go
	modified:   models/token.go
	modified:   models/update.go
	new file:   models/user_mail.go
	modified:   models/webhook.go
	new file:   models/webhook_slack.go
	new file:   models/wiki.go
	deleted:    modules/asn1-ber/LICENSE
	deleted:    modules/asn1-ber/Makefile
	deleted:    modules/asn1-ber/README
	deleted:    modules/asn1-ber/ber.go
	modified:   modules/auth/admin.go
	deleted:    modules/auth/apiv1/miscellaneous.go
	modified:   modules/auth/auth.go
	modified:   modules/auth/auth_form.go
	modified:   modules/auth/ldap/README.md
	modified:   modules/auth/ldap/ldap.go
	deleted:    modules/auth/ldap/ldap_test.go
	modified:   modules/auth/org.go
	new file:   modules/auth/pam/pam.go
	new file:   modules/auth/pam/pam_stub.go
	modified:   modules/auth/repo_form.go
	modified:   modules/avatar/avatar.go
	modified:   modules/avatar/avatar_test.go
	modified:   modules/base/base.go
	deleted:    modules/base/markdown.go
	modified:   modules/base/tool.go
	modified:   modules/bindata/bindata.go
	new file:   modules/context/api.go
	new file:   modules/context/api_org.go
	new file:   modules/context/auth.go
	new file:   modules/context/context.go
	new file:   modules/context/org.go
	new file:   modules/context/repo.go
	deleted:    modules/cron/constantdelay.go
	deleted:    modules/cron/constantdelay_test.go
	modified:   modules/cron/cron.go
	deleted:    modules/cron/cron_test.go
	deleted:    modules/cron/doc.go
	deleted:    modules/cron/manager.go
	deleted:    modules/cron/parser.go
	deleted:    modules/cron/parser_test.go
	deleted:    modules/cron/spec.go
	deleted:    modules/cron/spec_test.go
	deleted:    modules/git/blob.go
	deleted:    modules/git/commit_archive.go
	deleted:    modules/git/hooks.go
	deleted:    modules/git/repo.go
	deleted:    modules/git/repo_branch.go
	deleted:    modules/git/repo_commit.go
	deleted:    modules/git/repo_object.go
	deleted:    modules/git/repo_tag.go
	deleted:    modules/git/repo_tree.go
	deleted:    modules/git/sha1.go
	deleted:    modules/git/signature.go
	deleted:    modules/git/submodule.go
	deleted:    modules/git/tag.go
	deleted:    modules/git/tree.go
	deleted:    modules/git/tree_blob.go
	deleted:    modules/git/tree_entry.go
	deleted:    modules/git/utils.go
	deleted:    modules/git/version.go
	modified:   modules/httplib/httplib.go
	deleted:    modules/httplib/httplib_test.go
	deleted:    modules/ldap/LICENSE
	deleted:    modules/ldap/README
	deleted:    modules/ldap/_examples/enterprise.ldif
	deleted:    modules/ldap/_examples/modify.go
	deleted:    modules/ldap/_examples/search.go
	deleted:    modules/ldap/_examples/searchSSL.go
	deleted:    modules/ldap/_examples/searchTLS.go
	deleted:    modules/ldap/_examples/slapd.conf
	deleted:    modules/ldap/bind.go
	deleted:    modules/ldap/conn.go
	deleted:    modules/ldap/control.go
	deleted:    modules/ldap/debug.go
	deleted:    modules/ldap/filter.go
	deleted:    modules/ldap/filter_test.go
	deleted:    modules/ldap/ldap.go
	deleted:    modules/ldap/ldap_test.go
	deleted:    modules/ldap/modify.go
	deleted:    modules/ldap/search.go
	deleted:    modules/log/database.go
	modified:   modules/log/log.go
	deleted:    modules/mailer/mail.go
	new file:   modules/markdown/markdown.go
	new file:   modules/markdown/markdown_test.go
	deleted:    modules/middleware/auth.go
	deleted:    modules/middleware/context.go
	deleted:    modules/middleware/org.go
	deleted:    modules/middleware/repo.go
	modified:   modules/process/manager.go
	new file:   modules/setting/miniwinsvc.go
	modified:   modules/setting/setting.go
	deleted:    modules/setting/setting_memcache.go
	deleted:    modules/setting/setting_redis.go
	deleted:    modules/social/social.go
	modified:   modules/ssh/ssh.go
	new file:   modules/template/highlight/highlight.go
	new file:   modules/template/template.go
	new file:   modules/user/user.go
	deleted:    modules/uuid/README.md
	deleted:    modules/uuid/benchmarks_test.go
	deleted:    modules/uuid/uuid.go
	deleted:    modules/uuid/uuid_test.go
	deleted:    packager/debian/postinst
	new file:   packager/hooks/postinst
	new file:   public/assets/font-awesome-4.6.3/css/font-awesome.min.css
	new file:   public/assets/font-awesome-4.6.3/fonts/FontAwesome.otf
	new file:   public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.eot
	new file:   public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.svg
	new file:   public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.ttf
	new file:   public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.woff
	new file:   public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.woff2
	new file:   public/assets/octicons-4.3.0/octicons.eot
	new file:   public/assets/octicons-4.3.0/octicons.min.css
	new file:   public/assets/octicons-4.3.0/octicons.svg
	new file:   public/assets/octicons-4.3.0/octicons.ttf
	new file:   public/assets/octicons-4.3.0/octicons.woff
	new file:   public/assets/octicons-4.3.0/octicons.woff2
	new file:   public/config.codekit
	deleted:    public/css/bootstrap-colorpicker.min.css
	deleted:    public/css/bootstrap.css.map
	deleted:    public/css/bootstrap.min.css
	deleted:    public/css/datepicker3.css
	deleted:    public/css/font-awesome.min.css
	modified:   public/css/gogs.css
	deleted:    public/css/gogs.min.css
	deleted:    public/css/markdown.css
	new file:   public/css/semantic-2.2.1.min.css
	deleted:    public/css/semantic.min.css
	modified:   public/css/themes/default/assets/fonts/icons.eot
	modified:   public/css/themes/default/assets/fonts/icons.svg
	modified:   public/css/themes/default/assets/fonts/icons.ttf
	modified:   public/css/themes/default/assets/fonts/icons.woff
	modified:   public/css/themes/default/assets/fonts/icons.woff2
	new file:   public/css/themes/github/assets/fonts/octicons-local.ttf
	new file:   public/css/themes/github/assets/fonts/octicons.svg
	new file:   public/css/themes/github/assets/fonts/octicons.ttf
	new file:   public/css/themes/github/assets/fonts/octicons.woff
	deleted:    public/css/todc-bootstrap.css.map
	deleted:    public/css/todc-bootstrap.min.css
	deleted:    public/fonts/FontAwesome.otf
	deleted:    public/fonts/fontawesome-webfont.eot
	deleted:    public/fonts/fontawesome-webfont.svg
	deleted:    public/fonts/fontawesome-webfont.ttf
	deleted:    public/fonts/fontawesome-webfont.woff
	deleted:    public/fonts/fontawesome-webfont.woff2
	deleted:    public/fonts/octicons.eot
	deleted:    public/fonts/octicons.svg
	deleted:    public/fonts/octicons.ttf
	deleted:    public/fonts/octicons.woff
	modified:   public/img/404.png
	modified:   public/img/500.png
	deleted:    public/img/avatar_default.jpg
	new file:   public/img/avatar_default.png
	deleted:    public/img/bootstrap-colorpicker/alpha-horizontal.png
	deleted:    public/img/bootstrap-colorpicker/alpha.png
	deleted:    public/img/bootstrap-colorpicker/hue-horizontal.png
	deleted:    public/img/bootstrap-colorpicker/hue.png
	deleted:    public/img/bootstrap-colorpicker/saturation.png
	new file:   public/img/emoji/+1.png
	new file:   public/img/emoji/-1.png
	new file:   public/img/emoji/100.png
	new file:   public/img/emoji/1234.png
	new file:   public/img/emoji/8ball.png
	new file:   public/img/emoji/a.png
	new file:   public/img/emoji/ab.png
	new file:   public/img/emoji/abc.png
	new file:   public/img/emoji/abcd.png
	new file:   public/img/emoji/accept.png
	new file:   public/img/emoji/aerial_tramway.png
	new file:   public/img/emoji/airplane.png
	new file:   public/img/emoji/alarm_clock.png
	new file:   public/img/emoji/alien.png
	new file:   public/img/emoji/ambulance.png
	new file:   public/img/emoji/anchor.png
	new file:   public/img/emoji/angel.png
	new file:   public/img/emoji/anger.png
	new file:   public/img/emoji/angry.png
	new file:   public/img/emoji/anguished.png
	new file:   public/img/emoji/ant.png
	new file:   public/img/emoji/apple.png
	new file:   public/img/emoji/aquarius.png
	new file:   public/img/emoji/aries.png
	new file:   public/img/emoji/arrow_backward.png
	new file:   public/img/emoji/arrow_double_down.png
	new file:   public/img/emoji/arrow_double_up.png
	new file:   public/img/emoji/arrow_down.png
	new file:   public/img/emoji/arrow_down_small.png
	new file:   public/img/emoji/arrow_forward.png
	new file:   public/img/emoji/arrow_heading_down.png
	new file:   public/img/emoji/arrow_heading_up.png
	new file:   public/img/emoji/arrow_left.png
	new file:   public/img/emoji/arrow_lower_left.png
	new file:   public/img/emoji/arrow_lower_right.png
	new file:   public/img/emoji/arrow_right.png
	new file:   public/img/emoji/arrow_right_hook.png
	new file:   public/img/emoji/arrow_up.png
	new file:   public/img/emoji/arrow_up_down.png
	new file:   public/img/emoji/arrow_up_small.png
	new file:   public/img/emoji/arrow_upper_left.png
	new file:   public/img/emoji/arrow_upper_right.png
	new file:   public/img/emoji/arrows_clockwise.png
	new file:   public/img/emoji/arrows_counterclockwise.png
	new file:   public/img/emoji/art.png
	new file:   public/img/emoji/articulated_lorry.png
	new file:   public/img/emoji/astonished.png
	new file:   public/img/emoji/atm.png
	new file:   public/img/emoji/b.png
	new file:   public/img/emoji/baby.png
	new file:   public/img/emoji/baby_bottle.png
	new file:   public/img/emoji/baby_chick.png
	new file:   public/img/emoji/baby_symbol.png
	new file:   public/img/emoji/back.png
	new file:   public/img/emoji/baggage_claim.png
	new file:   public/img/emoji/balloon.png
	new file:   public/img/emoji/ballot_box_with_check.png
	new file:   public/img/emoji/bamboo.png
	new file:   public/img/emoji/banana.png
	new file:   public/img/emoji/bangbang.png
	new file:   public/img/emoji/bank.png
	new file:   public/img/emoji/bar_chart.png
	new file:   public/img/emoji/barber.png
	new file:   public/img/emoji/baseball.png
	new file:   public/img/emoji/basketball.png
	new file:   public/img/emoji/bath.png
	new file:   public/img/emoji/bathtub.png
	new file:   public/img/emoji/battery.png
	new file:   public/img/emoji/bear.png
	new file:   public/img/emoji/bee.png
	new file:   public/img/emoji/beer.png
	new file:   public/img/emoji/beers.png
	new file:   public/img/emoji/beetle.png
	new file:   public/img/emoji/beginner.png
	new file:   public/img/emoji/bell.png
	new file:   public/img/emoji/bento.png
	new file:   public/img/emoji/bicyclist.png
	new file:   public/img/emoji/bike.png
	new file:   public/img/emoji/bikini.png
	new file:   public/img/emoji/bird.png
	new file:   public/img/emoji/birthday.png
	new file:   public/img/emoji/black_circle.png
	new file:   public/img/emoji/black_joker.png
	new file:   public/img/emoji/black_medium_small_square.png
	new file:   public/img/emoji/black_medium_square.png
	new file:   public/img/emoji/black_nib.png
	new file:   public/img/emoji/black_small_square.png
	new file:   public/img/emoji/black_square.png
	new file:   public/img/emoji/black_square_button.png
	new file:   public/img/emoji/blossom.png
	new file:   public/img/emoji/blowfish.png
	new file:   public/img/emoji/blue_book.png
	new file:   public/img/emoji/blue_car.png
	new file:   public/img/emoji/blue_heart.png
	new file:   public/img/emoji/blush.png
	new file:   public/img/emoji/boar.png
	new file:   public/img/emoji/boat.png
	new file:   public/img/emoji/bomb.png
	new file:   public/img/emoji/book.png
	new file:   public/img/emoji/bookmark.png
	new file:   public/img/emoji/bookmark_tabs.png
	new file:   public/img/emoji/books.png
	new file:   public/img/emoji/boom.png
	new file:   public/img/emoji/boot.png
	new file:   public/img/emoji/bouquet.png
	new file:   public/img/emoji/bow.png
	new file:   public/img/emoji/bowling.png
	new file:   public/img/emoji/bowtie.png
	new file:   public/img/emoji/boy.png
	new file:   public/img/emoji/bread.png
	new file:   public/img/emoji/bride_with_veil.png
	new file:   public/img/emoji/bridge_at_night.png
	new file:   public/img/emoji/briefcase.png
	new file:   public/img/emoji/broken_heart.png
	new file:   public/img/emoji/bug.png
	new file:   public/img/emoji/bulb.png
	new file:   public/img/emoji/bullettrain_front.png
	new file:   public/img/emoji/bullettrain_side.png
	new file:   public/img/emoji/bus.png
	new file:   public/img/emoji/busstop.png
	new file:   public/img/emoji/bust_in_silhouette.png
	new file:   public/img/emoji/busts_in_silhouette.png
	new file:   public/img/emoji/cactus.png
	new file:   public/img/emoji/cake.png
	new file:   public/img/emoji/calendar.png
	new file:   public/img/emoji/calling.png
	new file:   public/img/emoji/camel.png
	new file:   public/img/emoji/camera.png
	new file:   public/img/emoji/cancer.png
	new file:   public/img/emoji/candy.png
	new file:   public/img/emoji/capital_abcd.png
	new file:   public/img/emoji/capricorn.png
	new file:   public/img/emoji/car.png
	new file:   public/img/emoji/card_index.png
	new file:   public/img/emoji/carousel_horse.png
	new file:   public/img/emoji/cat.png
	new file:   public/img/emoji/cat2.png
	new file:   public/img/emoji/cd.png
	new file:   public/img/emoji/chart.png
	new file:   public/img/emoji/chart_with_downwards_trend.png
	new file:   public/img/emoji/chart_with_upwards_trend.png
	new file:   public/img/emoji/checkered_flag.png
	new file:   public/img/emoji/cherries.png
	new file:   public/img/emoji/cherry_blossom.png
	new file:   public/img/emoji/chestnut.png
	new file:   public/img/emoji/chicken.png
	new file:   public/img/emoji/children_crossing.png
	new file:   public/img/emoji/chocolate_bar.png
	new file:   public/img/emoji/christmas_tree.png
	new file:   public/img/emoji/church.png
	new file:   public/img/emoji/cinema.png
	new file:   public/img/emoji/circus_tent.png
	new file:   public/img/emoji/city_sunrise.png
	new file:   public/img/emoji/city_sunset.png
	new file:   public/img/emoji/cl.png
	new file:   public/img/emoji/clap.png
	new file:   public/img/emoji/clapper.png
	new file:   public/img/emoji/clipboard.png
	new file:   public/img/emoji/clock1.png
	new file:   public/img/emoji/clock10.png
	new file:   public/img/emoji/clock1030.png
	new file:   public/img/emoji/clock11.png
	new file:   public/img/emoji/clock1130.png
	new file:   public/img/emoji/clock12.png
	new file:   public/img/emoji/clock1230.png
	new file:   public/img/emoji/clock130.png
	new file:   public/img/emoji/clock2.png
	new file:   public/img/emoji/clock230.png
	new file:   public/img/emoji/clock3.png
	new file:   public/img/emoji/clock330.png
	new file:   public/img/emoji/clock4.png
	new file:   public/img/emoji/clock430.png
	new file:   public/img/emoji/clock5.png
	new file:   public/img/emoji/clock530.png
	new file:   public/img/emoji/clock6.png
	new file:   public/img/emoji/clock630.png
	new file:   public/img/emoji/clock7.png
	new file:   public/img/emoji/clock730.png
	new file:   public/img/emoji/clock8.png
	new file:   public/img/emoji/clock830.png
	new file:   public/img/emoji/clock9.png
	new file:   public/img/emoji/clock930.png
	new file:   public/img/emoji/closed_book.png
	new file:   public/img/emoji/closed_lock_with_key.png
	new file:   public/img/emoji/closed_umbrella.png
	new file:   public/img/emoji/cloud.png
	new file:   public/img/emoji/clubs.png
	new file:   public/img/emoji/cn.png
	new file:   public/img/emoji/cocktail.png
	new file:   public/img/emoji/coffee.png
	new file:   public/img/emoji/cold_sweat.png
	new file:   public/img/emoji/collision.png
	new file:   public/img/emoji/computer.png
	new file:   public/img/emoji/confetti_ball.png
	new file:   public/img/emoji/confounded.png
	new file:   public/img/emoji/confused.png
	new file:   public/img/emoji/congratulations.png
	new file:   public/img/emoji/construction.png
	new file:   public/img/emoji/construction_worker.png
	new file:   public/img/emoji/convenience_store.png
	new file:   public/img/emoji/cookie.png
	new file:   public/img/emoji/cool.png
	new file:   public/img/emoji/cop.png
	new file:   public/img/emoji/copyright.png
	new file:   public/img/emoji/corn.png
	new file:   public/img/emoji/couple.png
	new file:   public/img/emoji/couple_with_heart.png
	new file:   public/img/emoji/couplekiss.png
	new file:   public/img/emoji/cow.png
	new file:   public/img/emoji/cow2.png
	new file:   public/img/emoji/credit_card.png
	new file:   public/img/emoji/crescent_moon.png
	new file:   public/img/emoji/crocodile.png
	new file:   public/img/emoji/crossed_flags.png
	new file:   public/img/emoji/crown.png
	new file:   public/img/emoji/cry.png
	new file:   public/img/emoji/crying_cat_face.png
	new file:   public/img/emoji/crystal_ball.png
	new file:   public/img/emoji/cupid.png
	new file:   public/img/emoji/curly_loop.png
	new file:   public/img/emoji/currency_exchange.png
	new file:   public/img/emoji/curry.png
	new file:   public/img/emoji/custard.png
	new file:   public/img/emoji/customs.png
	new file:   public/img/emoji/cyclone.png
	new file:   public/img/emoji/dancer.png
	new file:   public/img/emoji/dancers.png
	new file:   public/img/emoji/dango.png
	new file:   public/img/emoji/dart.png
	new file:   public/img/emoji/dash.png
	new file:   public/img/emoji/date.png
	new file:   public/img/emoji/de.png
	new file:   public/img/emoji/deciduous_tree.png
	new file:   public/img/emoji/department_store.png
	new file:   public/img/emoji/diamond_shape_with_a_dot_inside.png
	new file:   public/img/emoji/diamonds.png
	new file:   public/img/emoji/disappointed.png
	new file:   public/img/emoji/disappointed_relieved.png
	new file:   public/img/emoji/dizzy.png
	new file:   public/img/emoji/dizzy_face.png
	new file:   public/img/emoji/do_not_litter.png
	new file:   public/img/emoji/dog.png
	new file:   public/img/emoji/dog2.png
	new file:   public/img/emoji/dollar.png
	new file:   public/img/emoji/dolls.png
	new file:   public/img/emoji/dolphin.png
	new file:   public/img/emoji/donut.png
	new file:   public/img/emoji/door.png
	new file:   public/img/emoji/doughnut.png
	new file:   public/img/emoji/dragon.png
	new file:   public/img/emoji/dragon_face.png
	new file:   public/img/emoji/dress.png
	new file:   public/img/emoji/dromedary_camel.png
	new file:   public/img/emoji/droplet.png
	new file:   public/img/emoji/dvd.png
	new file:   public/img/emoji/e-mail.png
	new file:   public/img/emoji/ear.png
	new file:   public/img/emoji/ear_of_rice.png
	new file:   public/img/emoji/earth_africa.png
	new file:   public/img/emoji/earth_americas.png
	new file:   public/img/emoji/earth_asia.png
	new file:   public/img/emoji/egg.png
	new file:   public/img/emoji/eggplant.png
	new file:   public/img/emoji/eight.png
	new file:   public/img/emoji/eight_pointed_black_star.png
	new file:   public/img/emoji/eight_spoked_asterisk.png
	new file:   public/img/emoji/electric_plug.png
	new file:   public/img/emoji/elephant.png
	new file:   public/img/emoji/email.png
	new file:   public/img/emoji/end.png
	new file:   public/img/emoji/envelope.png
	new file:   public/img/emoji/es.png
	new file:   public/img/emoji/euro.png
	new file:   public/img/emoji/european_castle.png
	new file:   public/img/emoji/european_post_office.png
	new file:   public/img/emoji/evergreen_tree.png
	new file:   public/img/emoji/exclamation.png
	new file:   public/img/emoji/expressionless.png
	new file:   public/img/emoji/eyeglasses.png
	new file:   public/img/emoji/eyes.png
	new file:   public/img/emoji/facepunch.png
	new file:   public/img/emoji/factory.png
	new file:   public/img/emoji/fallen_leaf.png
	new file:   public/img/emoji/family.png
	new file:   public/img/emoji/fast_forward.png
	new file:   public/img/emoji/fax.png
	new file:   public/img/emoji/fearful.png
	new file:   public/img/emoji/feelsgood.png
	new file:   public/img/emoji/feet.png
	new file:   public/img/emoji/ferris_wheel.png
	new file:   public/img/emoji/file_folder.png
	new file:   public/img/emoji/finnadie.png
	new file:   public/img/emoji/fire.png
	new file:   public/img/emoji/fire_engine.png
	new file:   public/img/emoji/fireworks.png
	new file:   public/img/emoji/first_quarter_moon.png
	new file:   public/img/emoji/first_quarter_moon_with_face.png
	new file:   public/img/emoji/fish.png
	new file:   public/img/emoji/fish_cake.png
	new file:   public/img/emoji/fishing_pole_and_fish.png
	new file:   public/img/emoji/fist.png
	new file:   public/img/emoji/five.png
	new file:   public/img/emoji/flags.png
	new file:   public/img/emoji/flashlight.png
	new file:   public/img/emoji/floppy_disk.png
	new file:   public/img/emoji/flower_playing_cards.png
	new file:   public/img/emoji/flushed.png
	new file:   public/img/emoji/foggy.png
	new file:   public/img/emoji/football.png
	new file:   public/img/emoji/fork_and_knife.png
	new file:   public/img/emoji/fountain.png
	new file:   public/img/emoji/four.png
	new file:   public/img/emoji/four_leaf_clover.png
	new file:   public/img/emoji/fr.png
	new file:   public/img/emoji/free.png
	new file:   public/img/emoji/fried_shrimp.png
	new file:   public/img/emoji/fries.png
	new file:   public/img/emoji/frog.png
	new file:   public/img/emoji/frowning.png
	new file:   public/img/emoji/fu.png
	new file:   public/img/emoji/fuelpump.png
	new file:   public/img/emoji/full_moon.png
	new file:   public/img/emoji/full_moon_with_face.png
	new file:   public/img/emoji/game_die.png
	new file:   public/img/emoji/gb.png
	new file:   public/img/emoji/gem.png
	new file:   public/img/emoji/gemini.png
	new file:   public/img/emoji/ghost.png
	new file:   public/img/emoji/gift.png
	new file:   public/img/emoji/gift_heart.png
	new file:   public/img/emoji/girl.png
	new file:   public/img/emoji/globe_with_meridians.png
	new file:   public/img/emoji/goat.png
	new file:   public/img/emoji/goberserk.png
	new file:   public/img/emoji/godmode.png
	new file:   public/img/emoji/golf.png
	new file:   public/img/emoji/grapes.png
	new file:   public/img/emoji/green_apple.png
	new file:   public/img/emoji/green_book.png
	new file:   public/img/emoji/green_heart.png
	new file:   public/img/emoji/grey_exclamation.png
	new file:   public/img/emoji/grey_question.png
	new file:   public/img/emoji/grimacing.png
	new file:   public/img/emoji/grin.png
	new file:   public/img/emoji/grinning.png
	new file:   public/img/emoji/guardsman.png
	new file:   public/img/emoji/guitar.png
	new file:   public/img/emoji/gun.png
	new file:   public/img/emoji/haircut.png
	new file:   public/img/emoji/hamburger.png
	new file:   public/img/emoji/hammer.png
	new file:   public/img/emoji/hamster.png
	new file:   public/img/emoji/hand.png
	new file:   public/img/emoji/handbag.png
	new file:   public/img/emoji/hankey.png
	new file:   public/img/emoji/hash.png
	new file:   public/img/emoji/hatched_chick.png
	new file:   public/img/emoji/hatching_chick.png
	new file:   public/img/emoji/headphones.png
	new file:   public/img/emoji/hear_no_evil.png
	new file:   public/img/emoji/heart.png
	new file:   public/img/emoji/heart_decoration.png
	new file:   public/img/emoji/heart_eyes.png
	new file:   public/img/emoji/heart_eyes_cat.png
	new file:   public/img/emoji/heartbeat.png
	new file:   public/img/emoji/heartpulse.png
	new file:   public/img/emoji/hearts.png
	new file:   public/img/emoji/heavy_check_mark.png
	new file:   public/img/emoji/heavy_division_sign.png
	new file:   public/img/emoji/heavy_dollar_sign.png
	new file:   public/img/emoji/heavy_exclamation_mark.png
	new file:   public/img/emoji/heavy_minus_sign.png
	new file:   public/img/emoji/heavy_multiplication_x.png
	new file:   public/img/emoji/heavy_plus_sign.png
	new file:   public/img/emoji/helicopter.png
	new file:   public/img/emoji/herb.png
	new file:   public/img/emoji/hibiscus.png
	new file:   public/img/emoji/high_brightness.png
	new file:   public/img/emoji/high_heel.png
	new file:   public/img/emoji/hocho.png
	new file:   public/img/emoji/honey_pot.png
	new file:   public/img/emoji/honeybee.png
	new file:   public/img/emoji/horse.png
	new file:   public/img/emoji/horse_racing.png
	new file:   public/img/emoji/hospital.png
	new file:   public/img/emoji/hotel.png
	new file:   public/img/emoji/hotsprings.png
	new file:   public/img/emoji/hourglass.png
	new file:   public/img/emoji/hourglass_flowing_sand.png
	new file:   public/img/emoji/house.png
	new file:   public/img/emoji/house_with_garden.png
	new file:   public/img/emoji/hurtrealbad.png
	new file:   public/img/emoji/hushed.png
	new file:   public/img/emoji/ice_cream.png
	new file:   public/img/emoji/icecream.png
	new file:   public/img/emoji/id.png
	new file:   public/img/emoji/ideograph_advantage.png
	new file:   public/img/emoji/imp.png
	new file:   public/img/emoji/inbox_tray.png
	new file:   public/img/emoji/incoming_envelope.png
	new file:   public/img/emoji/information_desk_person.png
	new file:   public/img/emoji/information_source.png
	new file:   public/img/emoji/innocent.png
	new file:   public/img/emoji/interrobang.png
	new file:   public/img/emoji/iphone.png
	new file:   public/img/emoji/it.png
	new file:   public/img/emoji/izakaya_lantern.png
	new file:   public/img/emoji/jack_o_lantern.png
	new file:   public/img/emoji/japan.png
	new file:   public/img/emoji/japanese_castle.png
	new file:   public/img/emoji/japanese_goblin.png
	new file:   public/img/emoji/japanese_ogre.png
	new file:   public/img/emoji/jeans.png
	new file:   public/img/emoji/joy.png
	new file:   public/img/emoji/joy_cat.png
	new file:   public/img/emoji/jp.png
	new file:   public/img/emoji/key.png
	new file:   public/img/emoji/keycap_ten.png
	new file:   public/img/emoji/kimono.png
	new file:   public/img/emoji/kiss.png
	new file:   public/img/emoji/kissing.png
	new file:   public/img/emoji/kissing_cat.png
	new file:   public/img/emoji/kissing_closed_eyes.png
	new file:   public/img/emoji/kissing_face.png
	new file:   public/img/emoji/kissing_heart.png
	new file:   public/img/emoji/kissing_smiling_eyes.png
	new file:   public/img/emoji/koala.png
	new file:   public/img/emoji/koko.png
	new file:   public/img/emoji/kr.png
	new file:   public/img/emoji/large_blue_circle.png
	new file:   public/img/emoji/large_blue_diamond.png
	new file:   public/img/emoji/large_orange_diamond.png
	new file:   public/img/emoji/last_quarter_moon.png
	new file:   public/img/emoji/last_quarter_moon_with_face.png
	new file:   public/img/emoji/laughing.png
	new file:   public/img/emoji/leaves.png
	new file:   public/img/emoji/ledger.png
	new file:   public/img/emoji/left_luggage.png
	new file:   public/img/emoji/left_right_arrow.png
	new file:   public/img/emoji/leftwards_arrow_with_hook.png
	new file:   public/img/emoji/lemon.png
	new file:   public/img/emoji/leo.png
	new file:   public/img/emoji/leopard.png
	new file:   public/img/emoji/libra.png
	new file:   public/img/emoji/light_rail.png
	new file:   public/img/emoji/link.png
	new file:   public/img/emoji/lips.png
	new file:   public/img/emoji/lipstick.png
	new file:   public/img/emoji/lock.png
	new file:   public/img/emoji/lock_with_ink_pen.png
	new file:   public/img/emoji/lollipop.png
	new file:   public/img/emoji/loop.png
	new file:   public/img/emoji/loudspeaker.png
	new file:   public/img/emoji/love_hotel.png
	new file:   public/img/emoji/love_letter.png
	new file:   public/img/emoji/low_brightness.png
	new file:   public/img/emoji/m.png
	new file:   public/img/emoji/mag.png
	new file:   public/img/emoji/mag_right.png
	new file:   public/img/emoji/mahjong.png
	new file:   public/img/emoji/mailbox.png
	new file:   public/img/emoji/mailbox_closed.png
	new file:   public/img/emoji/mailbox_with_mail.png
	new file:   public/img/emoji/mailbox_with_no_mail.png
	new file:   public/img/emoji/man.png
	new file:   public/img/emoji/man_with_gua_pi_mao.png
	new file:   public/img/emoji/man_with_turban.png
	new file:   public/img/emoji/mans_shoe.png
	new file:   public/img/emoji/maple_leaf.png
	new file:   public/img/emoji/mask.png
	new file:   public/img/emoji/massage.png
	new file:   public/img/emoji/meat_on_bone.png
	new file:   public/img/emoji/mega.png
	new file:   public/img/emoji/melon.png
	new file:   public/img/emoji/memo.png
	new file:   public/img/emoji/mens.png
	new file:   public/img/emoji/metal.png
	new file:   public/img/emoji/metro.png
	new file:   public/img/emoji/microphone.png
	new file:   public/img/emoji/microscope.png
	new file:   public/img/emoji/milky_way.png
	new file:   public/img/emoji/minibus.png
	new file:   public/img/emoji/minidisc.png
	new file:   public/img/emoji/mobile_phone_off.png
	new file:   public/img/emoji/money_with_wings.png
	new file:   public/img/emoji/moneybag.png
	new file:   public/img/emoji/monkey.png
	new file:   public/img/emoji/monkey_face.png
	new file:   public/img/emoji/monorail.png
	new file:   public/img/emoji/mortar_board.png
	new file:   public/img/emoji/mount_fuji.png
	new file:   public/img/emoji/mountain_bicyclist.png
	new file:   public/img/emoji/mountain_cableway.png
	new file:   public/img/emoji/mountain_railway.png
	new file:   public/img/emoji/mouse.png
	new file:   public/img/emoji/mouse2.png
	new file:   public/img/emoji/movie_camera.png
	new file:   public/img/emoji/moyai.png
	new file:   public/img/emoji/muscle.png
	new file:   public/img/emoji/mushroom.png
	new file:   public/img/emoji/musical_keyboard.png
	new file:   public/img/emoji/musical_note.png
	new file:   public/img/emoji/musical_score.png
	new file:   public/img/emoji/mute.png
	new file:   public/img/emoji/nail_care.png
	new file:   public/img/emoji/name_badge.png
	new file:   public/img/emoji/neckbeard.png
	new file:   public/img/emoji/necktie.png
	new file:   public/img/emoji/negative_squared_cross_mark.png
	new file:   public/img/emoji/neutral_face.png
	new file:   public/img/emoji/new.png
	new file:   public/img/emoji/new_moon.png
	new file:   public/img/emoji/new_moon_with_face.png
	new file:   public/img/emoji/newspaper.png
	new file:   public/img/emoji/ng.png
	new file:   public/img/emoji/nine.png
	new file:   public/img/emoji/no_bell.png
	new file:   public/img/emoji/no_bicycles.png
	new file:   public/img/emoji/no_entry.png
	new file:   public/img/emoji/no_entry_sign.png
	new file:   public/img/emoji/no_good.png
	new file:   public/img/emoji/no_mobile_phones.png
	new file:   public/img/emoji/no_mouth.png
	new file:   public/img/emoji/no_pedestrians.png
	new file:   public/img/emoji/no_smoking.png
	new file:   public/img/emoji/non-potable_water.png
	new file:   public/img/emoji/nose.png
	new file:   public/img/emoji/notebook.png
	new file:   public/img/emoji/notebook_with_decorative_cover.png
	new file:   public/img/emoji/notes.png
	new file:   public/img/emoji/nut_and_bolt.png
	new file:   public/img/emoji/o.png
	new file:   public/img/emoji/o2.png
	new file:   public/img/emoji/ocean.png
	new file:   public/img/emoji/octocat.png
	new file:   public/img/emoji/octopus.png
	new file:   public/img/emoji/oden.png
	new file:   public/img/emoji/office.png
	new file:   public/img/emoji/ok.png
	new file:   public/img/emoji/ok_hand.png
	new file:   public/img/emoji/ok_woman.png
	new file:   public/img/emoji/older_man.png
	new file:   public/img/emoji/older_woman.png
	new file:   public/img/emoji/on.png
	new file:   public/img/emoji/oncoming_automobile.png
	new file:   public/img/emoji/oncoming_bus.png
	new file:   public/img/emoji/oncoming_police_car.png
	new file:   public/img/emoji/oncoming_taxi.png
	new file:   public/img/emoji/one.png
	new file:   public/img/emoji/open_file_folder.png
	new file:   public/img/emoji/open_hands.png
	new file:   public/img/emoji/open_mouth.png
	new file:   public/img/emoji/ophiuchus.png
	new file:   public/img/emoji/orange_book.png
	new file:   public/img/emoji/outbox_tray.png
	new file:   public/img/emoji/ox.png
	new file:   public/img/emoji/package.png
	new file:   public/img/emoji/page_facing_up.png
	new file:   public/img/emoji/page_with_curl.png
	new file:   public/img/emoji/pager.png
	new file:   public/img/emoji/palm_tree.png
	new file:   public/img/emoji/panda_face.png
	new file:   public/img/emoji/paperclip.png
	new file:   public/img/emoji/parking.png
	new file:   public/img/emoji/part_alternation_mark.png
	new file:   public/img/emoji/partly_sunny.png
	new file:   public/img/emoji/passport_control.png
	new file:   public/img/emoji/paw_prints.png
	new file:   public/img/emoji/peach.png
	new file:   public/img/emoji/pear.png
	new file:   public/img/emoji/pencil.png
	new file:   public/img/emoji/pencil2.png
	new file:   public/img/emoji/penguin.png
	new file:   public/img/emoji/pensive.png
	new file:   public/img/emoji/performing_arts.png
	new file:   public/img/emoji/persevere.png
	new file:   public/img/emoji/person_frowning.png
	new file:   public/img/emoji/person_with_blond_hair.png
	new file:   public/img/emoji/person_with_pouting_face.png
	new file:   public/img/emoji/phone.png
	new file:   public/img/emoji/pig.png
	new file:   public/img/emoji/pig2.png
	new file:   public/img/emoji/pig_nose.png
	new file:   public/img/emoji/pill.png
	new file:   public/img/emoji/pineapple.png
	new file:   public/img/emoji/pisces.png
	new file:   public/img/emoji/pizza.png
	new file:   public/img/emoji/plus1.png
	new file:   public/img/emoji/point_down.png
	new file:   public/img/emoji/point_left.png
	new file:   public/img/emoji/point_right.png
	new file:   public/img/emoji/point_up.png
	new file:   public/img/emoji/point_up_2.png
	new file:   public/img/emoji/police_car.png
	new file:   public/img/emoji/poodle.png
	new file:   public/img/emoji/poop.png
	new file:   public/img/emoji/post_office.png
	new file:   public/img/emoji/postal_horn.png
	new file:   public/img/emoji/postbox.png
	new file:   public/img/emoji/potable_water.png
	new file:   public/img/emoji/pouch.png
	new file:   public/img/emoji/poultry_leg.png
	new file:   public/img/emoji/pound.png
	new file:   public/img/emoji/pouting_cat.png
	new file:   public/img/emoji/pray.png
	new file:   public/img/emoji/princess.png
	new file:   public/img/emoji/punch.png
	new file:   public/img/emoji/purple_heart.png
	new file:   public/img/emoji/purse.png
	new file:   public/img/emoji/pushpin.png
	new file:   public/img/emoji/put_litter_in_its_place.png
	new file:   public/img/emoji/question.png
	new file:   public/img/emoji/rabbit.png
	new file:   public/img/emoji/rabbit2.png
	new file:   public/img/emoji/racehorse.png
	new file:   public/img/emoji/radio.png
	new file:   public/img/emoji/radio_button.png
	new file:   public/img/emoji/rage.png
	new file:   public/img/emoji/rage1.png
	new file:   public/img/emoji/rage2.png
	new file:   public/img/emoji/rage3.png
	new file:   public/img/emoji/rage4.png
	new file:   public/img/emoji/railway_car.png
	new file:   public/img/emoji/rainbow.png
	new file:   public/img/emoji/raised_hand.png
	new file:   public/img/emoji/raised_hands.png
	new file:   public/img/emoji/raising_hand.png
	new file:   public/img/emoji/ram.png
	new file:   public/img/emoji/ramen.png
	new file:   public/img/emoji/rat.png
	new file:   public/img/emoji/recycle.png
	new file:   public/img/emoji/red_car.png
	new file:   public/img/emoji/red_circle.png
	new file:   public/img/emoji/registered.png
	new file:   public/img/emoji/relaxed.png
	new file:   public/img/emoji/relieved.png
	new file:   public/img/emoji/repeat.png
	new file:   public/img/emoji/repeat_one.png
	new file:   public/img/emoji/restroom.png
	new file:   public/img/emoji/revolving_hearts.png
	new file:   public/img/emoji/rewind.png
	new file:   public/img/emoji/ribbon.png
	new file:   public/img/emoji/rice.png
	new file:   public/img/emoji/rice_ball.png
	new file:   public/img/emoji/rice_cracker.png
	new file:   public/img/emoji/rice_scene.png
	new file:   public/img/emoji/ring.png
	new file:   public/img/emoji/rocket.png
	new file:   public/img/emoji/roller_coaster.png
	new file:   public/img/emoji/rooster.png
	new file:   public/img/emoji/rose.png
	new file:   public/img/emoji/rotating_light.png
	new file:   public/img/emoji/round_pushpin.png
	new file:   public/img/emoji/rowboat.png
	new file:   public/img/emoji/ru.png
	new file:   public/img/emoji/rugby_football.png
	new file:   public/img/emoji/runner.png
	new file:   public/img/emoji/running.png
	new file:   public/img/emoji/running_shirt_with_sash.png
	new file:   public/img/emoji/sa.png
	new file:   public/img/emoji/sagittarius.png
	new file:   public/img/emoji/sailboat.png
	new file:   public/img/emoji/sake.png
	new file:   public/img/emoji/sandal.png
	new file:   public/img/emoji/santa.png
	new file:   public/img/emoji/satellite.png
	new file:   public/img/emoji/satisfied.png
	new file:   public/img/emoji/saxophone.png
	new file:   public/img/emoji/school.png
	new file:   public/img/emoji/school_satchel.png
	new file:   public/img/emoji/scissors.png
	new file:   public/img/emoji/scorpius.png
	new file:   public/img/emoji/scream.png
	new file:   public/img/emoji/scream_cat.png
	new file:   public/img/emoji/scroll.png
	new file:   public/img/emoji/seat.png
	new file:   public/img/emoji/secret.png
	new file:   public/img/emoji/see_no_evil.png
	new file:   public/img/emoji/seedling.png
	new file:   public/img/emoji/seven.png
	new file:   public/img/emoji/shaved_ice.png
	new file:   public/img/emoji/sheep.png
	new file:   public/img/emoji/shell.png
	new file:   public/img/emoji/ship.png
	new file:   public/img/emoji/shipit.png
	new file:   public/img/emoji/shirt.png
	new file:   public/img/emoji/shit.png
	new file:   public/img/emoji/shoe.png
	new file:   public/img/emoji/shower.png
	new file:   public/img/emoji/signal_strength.png
	new file:   public/img/emoji/six.png
	new file:   public/img/emoji/six_pointed_star.png
	new file:   public/img/emoji/ski.png
	new file:   public/img/emoji/skull.png
	new file:   public/img/emoji/sleeping.png
	new file:   public/img/emoji/sleepy.png
	new file:   public/img/emoji/slot_machine.png
	new file:   public/img/emoji/small_blue_diamond.png
	new file:   public/img/emoji/small_orange_diamond.png
	new file:   public/img/emoji/small_red_triangle.png
	new file:   public/img/emoji/small_red_triangle_down.png
	new file:   public/img/emoji/smile.png
	new file:   public/img/emoji/smile_cat.png
	new file:   public/img/emoji/smiley.png
	new file:   public/img/emoji/smiley_cat.png
	new file:   public/img/emoji/smiling_imp.png
	new file:   public/img/emoji/smirk.png
	new file:   public/img/emoji/smirk_cat.png
	new file:   public/img/emoji/smoking.png
	new file:   public/img/emoji/snail.png
	new file:   public/img/emoji/snake.png
	new file:   public/img/emoji/snowboarder.png
	new file:   public/img/emoji/snowflake.png
	new file:   public/img/emoji/snowman.png
	new file:   public/img/emoji/sob.png
	new file:   public/img/emoji/soccer.png
	new file:   public/img/emoji/soon.png
	new file:   public/img/emoji/sos.png
	new file:   public/img/emoji/sound.png
	new file:   public/img/emoji/space_invader.png
	new file:   public/img/emoji/spades.png
	new file:   public/img/emoji/spaghetti.png
	new file:   public/img/emoji/sparkle.png
	new file:   public/img/emoji/sparkler.png
	new file:   public/img/emoji/sparkles.png
	new file:   public/img/emoji/sparkling_heart.png
	new file:   public/img/emoji/speak_no_evil.png
	new file:   public/img/emoji/speaker.png
	new file:   public/img/emoji/speech_balloon.png
	new file:   public/img/emoji/speedboat.png
	new file:   public/img/emoji/squirrel.png
	new file:   public/img/emoji/star.png
	new file:   public/img/emoji/star2.png
	new file:   public/img/emoji/stars.png
	new file:   public/img/emoji/station.png
	new file:   public/img/emoji/statue_of_liberty.png
	new file:   public/img/emoji/steam_locomotive.png
	new file:   public/img/emoji/stew.png
	new file:   public/img/emoji/straight_ruler.png
	new file:   public/img/emoji/strawberry.png
	new file:   public/img/emoji/stuck_out_tongue.png
	new file:   public/img/emoji/stuck_out_tongue_closed_eyes.png
	new file:   public/img/emoji/stuck_out_tongue_winking_eye.png
	new file:   public/img/emoji/sun_with_face.png
	new file:   public/img/emoji/sunflower.png
	new file:   public/img/emoji/sunglasses.png
	new file:   public/img/emoji/sunny.png
	new file:   public/img/emoji/sunrise.png
	new file:   public/img/emoji/sunrise_over_mountains.png
	new file:   public/img/emoji/surfer.png
	new file:   public/img/emoji/sushi.png
	new file:   public/img/emoji/suspect.png
	new file:   public/img/emoji/suspension_railway.png
	new file:   public/img/emoji/sweat.png
	new file:   public/img/emoji/sweat_drops.png
	new file:   public/img/emoji/sweat_smile.png
	new file:   public/img/emoji/sweet_potato.png
	new file:   public/img/emoji/swimmer.png
	new file:   public/img/emoji/symbols.png
	new file:   public/img/emoji/syringe.png
	new file:   public/img/emoji/tada.png
	new file:   public/img/emoji/tanabata_tree.png
	new file:   public/img/emoji/tangerine.png
	new file:   public/img/emoji/taurus.png
	new file:   public/img/emoji/taxi.png
	new file:   public/img/emoji/tea.png
	new file:   public/img/emoji/telephone.png
	new file:   public/img/emoji/telephone_receiver.png
	new file:   public/img/emoji/telescope.png
	new file:   public/img/emoji/tennis.png
	new file:   public/img/emoji/tent.png
	new file:   public/img/emoji/thought_balloon.png
	new file:   public/img/emoji/three.png
	new file:   public/img/emoji/thumbsdown.png
	new file:   public/img/emoji/thumbsup.png
	new file:   public/img/emoji/ticket.png
	new file:   public/img/emoji/tiger.png
	new file:   public/img/emoji/tiger2.png
	new file:   public/img/emoji/tired_face.png
	new file:   public/img/emoji/tm.png
	new file:   public/img/emoji/toilet.png
	new file:   public/img/emoji/tokyo_tower.png
	new file:   public/img/emoji/tomato.png
	new file:   public/img/emoji/tongue.png
	new file:   public/img/emoji/top.png
	new file:   public/img/emoji/tophat.png
	new file:   public/img/emoji/tractor.png
	new file:   public/img/emoji/traffic_light.png
	new file:   public/img/emoji/train.png
	new file:   public/img/emoji/train2.png
	new file:   public/img/emoji/tram.png
	new file:   public/img/emoji/triangular_flag_on_post.png
	new file:   public/img/emoji/triangular_ruler.png
	new file:   public/img/emoji/trident.png
	new file:   public/img/emoji/triumph.png
	new file:   public/img/emoji/trolleybus.png
	new file:   public/img/emoji/trollface.png
	new file:   public/img/emoji/trophy.png
	new file:   public/img/emoji/tropical_drink.png
	new file:   public/img/emoji/tropical_fish.png
	new file:   public/img/emoji/truck.png
	new file:   public/img/emoji/trumpet.png
	new file:   public/img/emoji/tshirt.png
	new file:   public/img/emoji/tulip.png
	new file:   public/img/emoji/turtle.png
	new file:   public/img/emoji/tv.png
	new file:   public/img/emoji/twisted_rightwards_arrows.png
	new file:   public/img/emoji/two.png
	new file:   public/img/emoji/two_hearts.png
	new file:   public/img/emoji/two_men_holding_hands.png
	new file:   public/img/emoji/two_women_holding_hands.png
	new file:   public/img/emoji/u5272.png
	new file:   public/img/emoji/u5408.png
	new file:   public/img/emoji/u55b6.png
	new file:   public/img/emoji/u6307.png
	new file:   public/img/emoji/u6708.png
	new file:   public/img/emoji/u6709.png
	new file:   public/img/emoji/u6e80.png
	new file:   public/img/emoji/u7121.png
	new file:   public/img/emoji/u7533.png
	new file:   public/img/emoji/u7981.png
	new file:   public/img/emoji/u7a7a.png
	new file:   public/img/emoji/uk.png
	new file:   public/img/emoji/umbrella.png
	new file:   public/img/emoji/unamused.png
	new file:   public/img/emoji/underage.png
	new file:   public/img/emoji/unlock.png
	new file:   public/img/emoji/up.png
	new file:   public/img/emoji/us.png
	new file:   public/img/emoji/v.png
	new file:   public/img/emoji/vertical_traffic_light.png
	new file:   public/img/emoji/vhs.png
	new file:   public/img/emoji/vibration_mode.png
	new file:   public/img/emoji/video_camera.png
	new file:   public/img/emoji/video_game.png
	new file:   public/img/emoji/violin.png
	new file:   public/img/emoji/virgo.png
	new file:   public/img/emoji/volcano.png
	new file:   public/img/emoji/vs.png
	new file:   public/img/emoji/walking.png
	new file:   public/img/emoji/waning_crescent_moon.png
	new file:   public/img/emoji/waning_gibbous_moon.png
	new file:   public/img/emoji/warning.png
	new file:   public/img/emoji/watch.png
	new file:   public/img/emoji/water_buffalo.png
	new file:   public/img/emoji/watermelon.png
	new file:   public/img/emoji/wave.png
	new file:   public/img/emoji/wavy_dash.png
	new file:   public/img/emoji/waxing_crescent_moon.png
	new file:   public/img/emoji/waxing_gibbous_moon.png
	new file:   public/img/emoji/wc.png
	new file:   public/img/emoji/weary.png
	new file:   public/img/emoji/wedding.png
	new file:   public/img/emoji/whale.png
	new file:   public/img/emoji/whale2.png
	new file:   public/img/emoji/wheelchair.png
	new file:   public/img/emoji/white_check_mark.png
	new file:   public/img/emoji/white_circle.png
	new file:   public/img/emoji/white_flower.png
	new file:   public/img/emoji/white_large_square.png
	new file:   public/img/emoji/white_medium_small_square.png
	new file:   public/img/emoji/white_medium_square.png
	new file:   public/img/emoji/white_small_square.png
	new file:   public/img/emoji/white_square_button.png
	new file:   public/img/emoji/wind_chime.png
	new file:   public/img/emoji/wine_glass.png
	new file:   public/img/emoji/wink.png
	new file:   public/img/emoji/wolf.png
	new file:   public/img/emoji/woman.png
	new file:   public/img/emoji/womans_clothes.png
	new file:   public/img/emoji/womans_hat.png
	new file:   public/img/emoji/womens.png
	new file:   public/img/emoji/worried.png
	new file:   public/img/emoji/wrench.png
	new file:   public/img/emoji/x.png
	new file:   public/img/emoji/yellow_heart.png
	new file:   public/img/emoji/yen.png
	new file:   public/img/emoji/yum.png
	new file:   public/img/emoji/zap.png
	new file:   public/img/emoji/zero.png
	new file:   public/img/emoji/zzz.png
	new file:   public/img/gogs-large-resize.png
	modified:   public/img/gogs-lg.png
	new file:   public/img/slack.png
	deleted:    public/js/ZeroClipboard.swf
	deleted:    public/js/app.js
	deleted:    public/js/bootstrap-colorpicker.min.js
	deleted:    public/js/bootstrap-datepicker.js
	deleted:    public/js/bootstrap.min.js
	modified:   public/js/gogs.js
	deleted:    public/js/jquery-1.10.1.min.js
	deleted:    public/js/jquery-1.10.1.min.map
	deleted:    public/js/jquery-1.11.2.min.js
	new file:   public/js/jquery-1.11.3.min.js
	new file:   public/js/jquery.are-you-sure.js
	deleted:    public/js/jquery.validate.min.js
	deleted:    public/js/lib.js
	new file:   public/js/libs/clipboard-1.5.9.min.js
	new file:   public/js/libs/emojify-1.1.0.min.js
	deleted:    public/js/locales/bootstrap-datepicker.ar.js
	deleted:    public/js/locales/bootstrap-datepicker.az.js
	deleted:    public/js/locales/bootstrap-datepicker.bg.js
	deleted:    public/js/locales/bootstrap-datepicker.ca.js
	deleted:    public/js/locales/bootstrap-datepicker.cs.js
	deleted:    public/js/locales/bootstrap-datepicker.cy.js
	deleted:    public/js/locales/bootstrap-datepicker.da.js
	deleted:    public/js/locales/bootstrap-datepicker.de.js
	deleted:    public/js/locales/bootstrap-datepicker.el.js
	deleted:    public/js/locales/bootstrap-datepicker.es.js
	deleted:    public/js/locales/bootstrap-datepicker.et.js
	deleted:    public/js/locales/bootstrap-datepicker.fa.js
	deleted:    public/js/locales/bootstrap-datepicker.fi.js
	deleted:    public/js/locales/bootstrap-datepicker.fr.js
	deleted:    public/js/locales/bootstrap-datepicker.gl.js
	deleted:    public/js/locales/bootstrap-datepicker.he.js
	deleted:    public/js/locales/bootstrap-datepicker.hr.js
	deleted:    public/js/locales/bootstrap-datepicker.hu.js
	deleted:    public/js/locales/bootstrap-datepicker.id.js
	deleted:    public/js/locales/bootstrap-datepicker.is.js
	deleted:    public/js/locales/bootstrap-datepicker.it.js
	deleted:    public/js/locales/bootstrap-datepicker.ja.js
	deleted:    public/js/locales/bootstrap-datepicker.ka.js
	deleted:    public/js/locales/bootstrap-datepicker.kk.js
	deleted:    public/js/locales/bootstrap-datepicker.kr.js
	deleted:    public/js/locales/bootstrap-datepicker.lt.js
	deleted:    public/js/locales/bootstrap-datepicker.lv.js
	deleted:    public/js/locales/bootstrap-datepicker.mk.js
	deleted:    public/js/locales/bootstrap-datepicker.ms.js
	deleted:    public/js/locales/bootstrap-datepicker.nb.js
	deleted:    public/js/locales/bootstrap-datepicker.nl-BE.js
	deleted:    public/js/locales/bootstrap-datepicker.nl.js
	deleted:    public/js/locales/bootstrap-datepicker.no.js
	deleted:    public/js/locales/bootstrap-datepicker.pl.js
	deleted:    public/js/locales/bootstrap-datepicker.pt-BR.js
	deleted:    public/js/locales/bootstrap-datepicker.pt.js
	deleted:    public/js/locales/bootstrap-datepicker.ro.js
	deleted:    public/js/locales/bootstrap-datepicker.rs-latin.js
	deleted:    public/js/locales/bootstrap-datepicker.rs.js
	deleted:    public/js/locales/bootstrap-datepicker.ru.js
	deleted:    public/js/locales/bootstrap-datepicker.sk.js
	deleted:    public/js/locales/bootstrap-datepicker.sl.js
	deleted:    public/js/locales/bootstrap-datepicker.sq.js
	deleted:    public/js/locales/bootstrap-datepicker.sv.js
	deleted:    public/js/locales/bootstrap-datepicker.sw.js
	deleted:    public/js/locales/bootstrap-datepicker.th.js
	deleted:    public/js/locales/bootstrap-datepicker.tr.js
	deleted:    public/js/locales/bootstrap-datepicker.ua.js
	deleted:    public/js/locales/bootstrap-datepicker.vi.js
	deleted:    public/js/locales/bootstrap-datepicker.zh-CN.js
	deleted:    public/js/locales/bootstrap-datepicker.zh-TW.js
	deleted:    public/js/min/gogs-min.js
	new file:   public/js/semantic-2.2.1.min.js
	deleted:    public/js/semantic.min.js
	new file:   public/less/_admin.less
	modified:   public/less/_base.less
	new file:   public/less/_dashboard.less
	new file:   public/less/_emojify.less
	new file:   public/less/_explore.less
	new file:   public/less/_form.less
	modified:   public/less/_home.less
	new file:   public/less/_install.less
	new file:   public/less/_markdown.less
	deleted:    public/less/_octicons.less
	new file:   public/less/_organization.less
	new file:   public/less/_repository.less
	new file:   public/less/_user.less
	modified:   public/less/gogs.less
	deleted:    public/ng/css/gogs.css
	deleted:    public/ng/css/magnific-popup.css
	deleted:    public/ng/css/tipsy.css
	deleted:    public/ng/css/ui.css
	deleted:    public/ng/fonts/FontAwesome.otf
	deleted:    public/ng/fonts/fontawesome-webfont.eot
	deleted:    public/ng/fonts/fontawesome-webfont.svg
	deleted:    public/ng/fonts/fontawesome-webfont.ttf
	deleted:    public/ng/fonts/fontawesome-webfont.woff
	deleted:    public/ng/fonts/octicons.css
	deleted:    public/ng/fonts/octicons.eot
	deleted:    public/ng/fonts/octicons.svg
	deleted:    public/ng/fonts/octicons.ttf
	deleted:    public/ng/fonts/octicons.woff
	deleted:    public/ng/js/gogs.js
	deleted:    public/ng/js/gogs/issue_label.js
	deleted:    public/ng/js/lib/jquery-1.11.1.min.js
	deleted:    public/ng/js/lib/jquery.magnific-popup.min.js
	deleted:    public/ng/js/lib/jquery.tipsy.js
	deleted:    public/ng/js/lib/lib.js
	deleted:    public/ng/js/min/gogs-min.js
	deleted:    public/ng/js/utils/preview.js
	deleted:    public/ng/js/utils/tabs.js
	deleted:    public/ng/less/gogs.less
	deleted:    public/ng/less/gogs/admin.less
	deleted:    public/ng/less/gogs/base.less
	deleted:    public/ng/less/gogs/dashboard.less
	deleted:    public/ng/less/gogs/external.less
	deleted:    public/ng/less/gogs/issue.less
	deleted:    public/ng/less/gogs/markdown.less
	deleted:    public/ng/less/gogs/organization.less
	deleted:    public/ng/less/gogs/profile.less
	deleted:    public/ng/less/gogs/repository.less
	deleted:    public/ng/less/gogs/settings.less
	deleted:    public/ng/less/gogs/sign.less
	deleted:    public/ng/less/ui.less
	deleted:    public/ng/less/ui/alert.less
	deleted:    public/ng/less/ui/bread.less
	deleted:    public/ng/less/ui/form.less
	deleted:    public/ng/less/ui/grid.less
	deleted:    public/ng/less/ui/label.less
	deleted:    public/ng/less/ui/menu.less
	deleted:    public/ng/less/ui/pager.less
	deleted:    public/ng/less/ui/panel.less
	deleted:    public/ng/less/ui/reset.less
	deleted:    public/ng/less/ui/table.less
	deleted:    public/ng/less/ui/var.less
	new file:   public/plugins/dropzone-4.2.0/dropzone.css
	new file:   public/plugins/dropzone-4.2.0/dropzone.js
	new file:   public/plugins/highlight-9.2.0/default.css
	new file:   public/plugins/highlight-9.2.0/github.css
	new file:   public/plugins/highlight-9.2.0/highlight.pack.js
	new file:   public/plugins/jquery.datetimepicker-2.4.5/jquery.datetimepicker.css
	new file:   public/plugins/jquery.datetimepicker-2.4.5/jquery.datetimepicker.js
	new file:   public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.css
	new file:   public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.min.js
	new file:   public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.png
	new file:   public/plugins/pdfjs-1.4.20/LICENSE
	new file:   public/plugins/pdfjs-1.4.20/build/pdf.js
	new file:   public/plugins/pdfjs-1.4.20/build/pdf.worker.js
	new file:   public/plugins/pdfjs-1.4.20/web/compatibility.js
	new file:   public/plugins/pdfjs-1.4.20/web/debugger.js
	new file:   public/plugins/pdfjs-1.4.20/web/images/annotation-check.svg
	new file:   public/plugins/pdfjs-1.4.20/web/images/annotation-comment.svg
	new file:   public/plugins/pdfjs-1.4.20/web/images/annotation-help.svg
	new file:   public/plugins/pdfjs-1.4.20/web/images/annotation-insert.svg
	new file:   public/plugins/pdfjs-1.4.20/web/images/annotation-key.svg
	new file:   public/plugins/pdfjs-1.4.20/web/images/annotation-newparagraph.svg
	new file:   public/plugins/pdfjs-1.4.20/web/images/annotation-noicon.svg
	new file:   public/plugins/pdfjs-1.4.20/web/images/annotation-note.svg
	new file:   public/plugins/pdfjs-1.4.20/web/images/annotation-paragraph.svg
	new file:   public/plugins/pdfjs-1.4.20/web/images/findbarButton-next-rtl.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/findbarButton-next-rtl@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/findbarButton-next.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/findbarButton-next@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/findbarButton-previous-rtl.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/findbarButton-previous-rtl@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/findbarButton-previous.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/findbarButton-previous@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/grab.cur
	new file:   public/plugins/pdfjs-1.4.20/web/images/grabbing.cur
	new file:   public/plugins/pdfjs-1.4.20/web/images/loading-icon.gif
	new file:   public/plugins/pdfjs-1.4.20/web/images/loading-small.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/loading-small@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-documentProperties.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-documentProperties@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-firstPage.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-firstPage@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-handTool.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-handTool@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-lastPage.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-lastPage@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-rotateCcw.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-rotateCcw@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-rotateCw.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-rotateCw@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/shadow.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/texture.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-bookmark.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-bookmark@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-download.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-download@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-menuArrows.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-menuArrows@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-openFile.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-openFile@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageDown-rtl.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageDown-rtl@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageDown.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageDown@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageUp-rtl.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageUp-rtl@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageUp.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageUp@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-presentationMode.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-presentationMode@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-print.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-print@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-search.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-search@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-secondaryToolbarToggle-rtl.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-secondaryToolbarToggle.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-secondaryToolbarToggle@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-sidebarToggle-rtl.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-sidebarToggle-rtl@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-sidebarToggle.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-sidebarToggle@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewAttachments.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewAttachments@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewOutline-rtl.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewOutline-rtl@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewOutline.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewOutline@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewThumbnail.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewThumbnail@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-zoomIn.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-zoomIn@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-zoomOut.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/toolbarButton-zoomOut@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/treeitem-collapsed-rtl.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/treeitem-collapsed-rtl@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/treeitem-collapsed.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/treeitem-collapsed@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/treeitem-expanded.png
	new file:   public/plugins/pdfjs-1.4.20/web/images/treeitem-expanded@2x.png
	new file:   public/plugins/pdfjs-1.4.20/web/viewer.css
	new file:   public/plugins/pdfjs-1.4.20/web/viewer.html
	new file:   public/plugins/pdfjs-1.4.20/web/viewer.js
	new file:   public/plugins/simplemde-1.10.1/simplemde.min.css
	new file:   public/plugins/simplemde-1.10.1/simplemde.min.js
	modified:   routers/admin/admin.go
	modified:   routers/admin/auths.go
	modified:   routers/admin/notice.go
	modified:   routers/admin/orgs.go
	modified:   routers/admin/repos.go
	modified:   routers/admin/users.go
	new file:   routers/api/v1/admin/org.go
	new file:   routers/api/v1/admin/org_repo.go
	new file:   routers/api/v1/admin/org_team.go
	new file:   routers/api/v1/admin/repo.go
	new file:   routers/api/v1/admin/user.go
	new file:   routers/api/v1/api.go
	new file:   routers/api/v1/convert/convert.go
	new file:   routers/api/v1/convert/utils.go
	new file:   routers/api/v1/misc/markdown.go
	deleted:    routers/api/v1/miscellaneous.go
	new file:   routers/api/v1/org/org.go
	new file:   routers/api/v1/org/team.go
	new file:   routers/api/v1/repo/branch.go
	new file:   routers/api/v1/repo/file.go
	new file:   routers/api/v1/repo/hook.go
	new file:   routers/api/v1/repo/issue.go
	new file:   routers/api/v1/repo/key.go
	new file:   routers/api/v1/repo/repo.go
	deleted:    routers/api/v1/repo_file.go
	new file:   routers/api/v1/user/app.go
	new file:   routers/api/v1/user/email.go
	new file:   routers/api/v1/user/follower.go
	new file:   routers/api/v1/user/key.go
	new file:   routers/api/v1/user/user.go
	deleted:    routers/api/v1/user_app.go
	modified:   routers/dev/template.go
	modified:   routers/install.go
	modified:   routers/org/members.go
	modified:   routers/org/org.go
	modified:   routers/org/setting.go
	modified:   routers/org/teams.go
	modified:   routers/repo/branch.go
	modified:   routers/repo/commit.go
	modified:   routers/repo/download.go
	modified:   routers/repo/http.go
	modified:   routers/repo/pull.go
	modified:   routers/repo/release.go
	modified:   routers/repo/repo.go
	modified:   routers/repo/view.go
	new file:   routers/repo/webhook.go
	new file:   routers/repo/wiki.go
	modified:   routers/user/home.go
	new file:   routers/user/profile.go
	modified:   routers/user/setting.go
	deleted:    routers/user/social.go
	modified:   scripts/build.sh
	deleted:    scripts/gogs_supervisord.sh
	modified:   scripts/init/centos/gogs
	modified:   scripts/init/debian/gogs
	modified:   scripts/init/freebsd/gogs
	new file:   scripts/init/openbsd/gogs
	new file:   scripts/launchd/io.gogs.web.plist
	deleted:    scripts/less.sh
	modified:   scripts/mysql.sql
	new file:   scripts/supervisor/gogs
	modified:   scripts/systemd/gogs.service
	new file:   scripts/windows/install-as-service.bat
	modified:   templates/admin/auth/edit.tmpl
	modified:   templates/admin/auth/list.tmpl
	modified:   templates/admin/auth/new.tmpl
	new file:   templates/admin/base/page.tmpl
	new file:   templates/admin/base/search.tmpl
	modified:   templates/admin/config.tmpl
	modified:   templates/admin/dashboard.tmpl
	modified:   templates/admin/monitor.tmpl
	modified:   templates/admin/nav.tmpl
	new file:   templates/admin/navbar.tmpl
	modified:   templates/admin/notice.tmpl
	modified:   templates/admin/org/list.tmpl
	modified:   templates/admin/repo/list.tmpl
	modified:   templates/admin/user/edit.tmpl
	modified:   templates/admin/user/list.tmpl
	modified:   templates/admin/user/new.tmpl
	modified:   templates/base/alert.tmpl
	new file:   templates/base/delete_modal_actions.tmpl
	deleted:    templates/base/footer_old.tmpl
	deleted:    templates/base/head_old.tmpl
	deleted:    templates/base/navbar.tmpl
	deleted:    templates/explore/nav.tmpl
	new file:   templates/explore/navbar.tmpl
	new file:   templates/explore/page.tmpl
	new file:   templates/explore/repo_list.tmpl
	modified:   templates/explore/repos.tmpl
	new file:   templates/explore/search.tmpl
	new file:   templates/explore/users.tmpl
	modified:   templates/install.tmpl
	new file:   templates/mail/auth/activate.tmpl
	modified:   templates/mail/auth/activate_email.tmpl
	deleted:    templates/mail/auth/active.tmpl
	new file:   templates/mail/auth/register_notify.tmpl
	deleted:    templates/mail/auth/register_success.tmpl
	modified:   templates/mail/auth/reset_passwd.tmpl
	new file:   templates/mail/issue/comment.tmpl
	new file:   templates/mail/issue/mention.tmpl
	modified:   templates/mail/notify/collaborator.tmpl
	deleted:    templates/mail/notify/mention.tmpl
	deleted:    templates/ng/base/alert.tmpl
	deleted:    templates/ng/base/social.tmpl
	deleted:    templates/org/base/header.tmpl
	modified:   templates/org/create.tmpl
	new file:   templates/org/header.tmpl
	modified:   templates/org/home.tmpl
	modified:   templates/org/member/invite.tmpl
	modified:   templates/org/member/members.tmpl
	deleted:    templates/org/new.tmpl
	modified:   templates/org/settings/delete.tmpl
	modified:   templates/org/settings/hook_new.tmpl
	modified:   templates/org/settings/hooks.tmpl
	deleted:    templates/org/settings/nav.tmpl
	new file:   templates/org/settings/navbar.tmpl
	modified:   templates/org/settings/options.tmpl
	modified:   templates/org/team/members.tmpl
	modified:   templates/org/team/new.tmpl
	modified:   templates/org/team/repositories.tmpl
	modified:   templates/org/team/sidebar.tmpl
	modified:   templates/org/team/teams.tmpl
	modified:   templates/repo/bare.tmpl
	deleted:    templates/repo/branch.tmpl
	new file:   templates/repo/branch_dropdown.tmpl
	modified:   templates/repo/commits.tmpl
	modified:   templates/repo/commits_table.tmpl
	modified:   templates/repo/create.tmpl
	modified:   templates/repo/diff.tmpl
	new file:   templates/repo/diff_box.tmpl
	deleted:    templates/repo/fork.tmpl
	new file:   templates/repo/forks.tmpl
	modified:   templates/repo/header.tmpl
	modified:   templates/repo/home.tmpl
	new file:   templates/repo/issue/comment_tab.tmpl
	deleted:    templates/repo/issue/create.tmpl
	new file:   templates/repo/issue/label_precolors.tmpl
	new file:   templates/repo/issue/labels.tmpl
	deleted:    templates/repo/issue/milestone.tmpl
	deleted:    templates/repo/issue/milestone_edit.tmpl
	modified:   templates/repo/issue/milestone_new.tmpl
	new file:   templates/repo/issue/milestones.tmpl
	new file:   templates/repo/issue/navbar.tmpl
	new file:   templates/repo/issue/new.tmpl
	new file:   templates/repo/issue/new_form.tmpl
	new file:   templates/repo/issue/view_content.tmpl
	new file:   templates/repo/issue/view_title.tmpl
	deleted:    templates/repo/issue2/labels.tmpl
	deleted:    templates/repo/issue2/list.tmpl
	deleted:    templates/repo/list.tmpl
	modified:   templates/repo/migrate.tmpl
	deleted:    templates/repo/milestone2/list.tmpl
	deleted:    templates/repo/nav.tmpl
	deleted:    templates/repo/pr2/list.tmpl
	deleted:    templates/repo/pulls.tmpl
	new file:   templates/repo/pulls/commits.tmpl
	new file:   templates/repo/pulls/compare.tmpl
	new file:   templates/repo/pulls/files.tmpl
	new file:   templates/repo/pulls/fork.tmpl
	new file:   templates/repo/pulls/tab_menu.tmpl
	deleted:    templates/repo/release/edit.tmpl
	modified:   templates/repo/release/list.tmpl
	modified:   templates/repo/release/new.tmpl
	deleted:    templates/repo/setting_nav.tmpl
	modified:   templates/repo/settings/collaboration.tmpl
	new file:   templates/repo/settings/deploy_keys.tmpl
	modified:   templates/repo/settings/githook_edit.tmpl
	modified:   templates/repo/settings/githooks.tmpl
	new file:   templates/repo/settings/hook_delete_modal.tmpl
	modified:   templates/repo/settings/hook_gogs.tmpl
	new file:   templates/repo/settings/hook_history.tmpl
	new file:   templates/repo/settings/hook_list.tmpl
	modified:   templates/repo/settings/hook_settings.tmpl
	modified:   templates/repo/settings/hook_slack.tmpl
	deleted:    templates/repo/settings/hook_types.tmpl
	modified:   templates/repo/settings/hooks.tmpl
	modified:   templates/repo/settings/nav.tmpl
	new file:   templates/repo/settings/navbar.tmpl
	modified:   templates/repo/settings/options.tmpl
	deleted:    templates/repo/sidebar.tmpl
	deleted:    templates/repo/sidebar_mini.tmpl
	deleted:    templates/repo/toolbar.tmpl
	new file:   templates/repo/user_cards.tmpl
	modified:   templates/repo/view_file.tmpl
	modified:   templates/repo/view_list.tmpl
	new file:   templates/repo/watchers.tmpl
	new file:   templates/repo/wiki/new.tmpl
	new file:   templates/repo/wiki/pages.tmpl
	new file:   templates/repo/wiki/start.tmpl
	new file:   templates/repo/wiki/view.tmpl
	deleted:    templates/status/401.tmpl
	deleted:    templates/status/403.tmpl
	modified:   templates/status/500.tmpl
	modified:   templates/user/auth/activate.tmpl
	modified:   templates/user/auth/forgot_passwd.tmpl
	new file:   templates/user/auth/prohibit_login.tmpl
	modified:   templates/user/auth/reset_passwd.tmpl
	modified:   templates/user/auth/signin.tmpl
	modified:   templates/user/dashboard/dashboard.tmpl
	new file:   templates/user/dashboard/issues.tmpl
	deleted:    templates/user/dashboard/nav.tmpl
	new file:   templates/user/dashboard/navbar.tmpl
	deleted:    templates/user/dashboard/pulls.tmpl
	deleted:    templates/user/issues.tmpl
	new file:   templates/user/meta/followers.tmpl
	new file:   templates/user/meta/header.tmpl
	new file:   templates/user/meta/stars.tmpl
	modified:   templates/user/settings/applications.tmpl
	modified:   templates/user/settings/delete.tmpl
	modified:   templates/user/settings/email.tmpl
	deleted:    templates/user/settings/nav.tmpl
	new file:   templates/user/settings/navbar.tmpl
	modified:   templates/user/settings/password.tmpl
	deleted:    templates/user/settings/social.tmpl
	modified:   templates/user/settings/sshkeys.tmpl

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	both modified:   .gitignore
	both modified:   cmd/web.go
	both modified:   models/issue.go
	both modified:   models/repo.go
	both modified:   models/user.go
	both modified:   modules/auth/user_form.go
	deleted by them: modules/base/template.go
	deleted by them: modules/git/commit.go
	both modified:   modules/mailer/mailer.go
	deleted by them: routers/api/v1/repo.go
	deleted by them: routers/api/v1/repo_hooks.go
	deleted by them: routers/api/v1/user.go
	both modified:   routers/home.go
	both modified:   routers/repo/issue.go
	both modified:   routers/repo/setting.go
	both modified:   routers/user/auth.go
	both modified:   templates/.VERSION
	both modified:   templates/base/footer.tmpl
	both modified:   templates/base/head.tmpl
	both modified:   templates/home.tmpl
	deleted by them: templates/ng/base/footer.tmpl
	deleted by them: templates/ng/base/head.tmpl
	deleted by them: templates/ng/base/header.tmpl
	both modified:   templates/repo/issue/list.tmpl
	both modified:   templates/repo/issue/view.tmpl
	both modified:   templates/repo/settings/hook_new.tmpl
	both modified:   templates/status/404.tmpl
	both modified:   templates/user/auth/signup.tmpl
	both modified:   templates/user/dashboard/feeds.tmpl
	both modified:   templates/user/profile.tmpl
	both modified:   templates/user/settings/profile.tmpl