projects / efiction3-v2 / commit
search:
summary | shortlog | log | commit | commitdiff | tree

Merge branch 'master' of https://github.com/jsnider2/efiction_v3_stable into jsnider2-master
author Rainer Volkrodt
()
committer Rainer Volkrodt
()
commit 072174dffdffac60b92fdcc00f11ddacc0351664
tree fdd045539d7617a8b0ecac6c76bb7d2393a1a03e tree | snapshot
parent 22858b4eceea58dc22b417499ed26d8d58595eeb commit | commitdiff
parent 94417774241deeaf340c9434135fed42b738a15d commit | commitdiff
Merge branch 'master' of https://github.com/jsnider2/efiction_v3_stable into jsnider2-master

Conflicts:
install/install.php
includes/mysql_functions.php blob | diff | history | plain
includes/mysqli_functions.php blob | diff | history | plain
install/install.php blob | diff | history | plain
Hard 'fork' of https://github.com/e107-eFiction/efiction_v3_stable , which was a continuation of https://github.com/eFiction/v3_stable , mainly to preserve commits for reference only.
GitPHP by Chris Han