Merge remote-tracking branch 'origin/master'
# Conflicts: # andrea/css/andrea.css # bruce/css/bootstrap-theme.css # bruce/css/bootstrap.css # bruce/css/bruce.css # classic/css/classic.css # community/css/community.css # ease/css/ease.css # favourite/css/favourite.css # finding/css/finding.css # i-nove/css/i-nove.css # metro-hot/css/metro-hot-responsive.css # metro-hot/css/metro-hot.css # neoease/css/neoease.css # owmx-3.0/css/owmx-3.0.css # timeline/css/timeline.css # tree-house/css/tree-house.css # yilia/css/yilia.css
This commit is contained in:
commit
4198ec0081
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
<<<<<<< HEAD
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -15,6 +16,8 @@
|
|||
*/
|
||||
/**
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
* Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010-2016, b3log.org & hacpai.com
|
||||
# Copyright (c) 2010-2017, b3log.org & hacpai.com
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
Loading…
Reference in New Issue