Merge branch 'trunk' into bootstrap-ui
Conflicts:
README.md
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/8925b140
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/8925b140
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/8925b140
Branch: refs/heads/bootstrap-ui
Commit: 8925b1401d814e2a7e1d9a625eca1d08f0ceff72
Parents: 700682a f515dea
Author: Dave Johnson <[email protected]>
Authored: Sat Dec 26 15:35:05 2015 -0500
Committer: Dave Johnson <[email protected]>
Committed: Sat Dec 26 15:35:05 2015 -0500
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/8925b140/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 0000000,0000000..bfa6a22
new file mode 100644
--- /dev/null
+++ b/.gitignore
@@@ -1,0 -1,0 +1,1 @@@
++# Created by .ignore support plugin (hsz.mobi)
