rpg - Můj web o RP hrách

	Commit message (Collapse)	Author	Age
*	added .idea project folder to gitignore	Dominik Eckelmann	2012-11-29
\|
*	Merge branch 'guide' of git://github.com/splitbrain/dokuwiki into ↵	Andreas Gohr	2012-11-18
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pull-request-118 * 'guide' of git://github.com/splitbrain/dokuwiki: changed semicolon to colon in link to welcome page to make it less confusing added initial pages to not be ignored by git improved welcome text added welcome page changed the link in the installer to point to wiki:welcome Conflicts: inc/lang/fr/lang.php
\| *	added initial pages to not be ignored by git	Anika Henke	2012-07-14
\| \|
* \|	git ignore IntelliJ Idea .iml files	Andreas Gohr	2012-08-22
\|/
*	Merge pull request #96 from dom-mel/phpunit	Andreas Gohr	2012-05-01
\|\ \| \| \| \|	Replace SimpleTest with PHPUnit
\| *	added testing plugin exception	Tobias Sarnowski	2012-04-18
\| \|
* \|	Unignore bundled template files in git as suggested by @timroes	Michael Hamann	2012-04-27
\|/
*	added the new data/media* directories to .gitignore	Andreas Gohr	2011-10-15
\|
*	added new plugins config cascade and added plugin.info.txt	Piyush Mishra	2011-08-20
\|
*	Merge branch 'jquery'	Michael Hamann	2011-05-29
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/scripts/edit.js lib/scripts/locktimer.js Some whitespace (at end of line) cleanup
\| *	jQuery rewrite branch merged into master branch of whole project	Michal Rezler	2011-03-23
\| \|\
\| * \|	ignoring .DS_Store, it's Mac OS X File generated by the Finder.app	Pierre Spring	2010-10-10
\| \| \|
* \| \|	Don't ignore bundled plugin paths	Guy Brand	2011-04-17
\| \|/ \|/\|
* \|	Language files can now be customized in the conf/ directory	Michael Hamann	2010-12-29
\|/ \| \| \| \| \|	As suggested by Robin Getz locale .txt files can now be duplicated and changed in the conf/lang/ directory and conf/plugin_lang/$plugin/ directory for plugins.
*	more gitignore paths	Andreas Gohr	2010-01-05
\|
*	ignore site-local conf files	Mike Frysinger	2010-01-05
	Signed-off-by: Mike Frysinger <vapier@gentoo.org>