"Settings" aren't called "Settings" anymore #185

Merged
annando merged 5 commits from master into master 2014-03-23 08:30:26 +01:00

5 commits

Author SHA1 Message Date
Michael Vogel 81e05e6274 Merge remote-tracking branch 'upstream/master'
Conflicts:
	startpage/startpage.php
2014-03-22 23:48:01 +01:00
Michael Vogel 503ec7d072 Removed the word "Settings" from the settings. This information is redundant. 2014-03-16 20:50:36 +01:00
Michael Vogel c4578aafa0 Improved SQL scripts 2014-03-16 19:13:57 +01:00
Michael Vogel 0568a5d8bb convpath: changed strategy for url conversion. 2014-03-16 19:12:41 +01:00
Michael Vogel 3eaefaa822 fbpost: Adapted changed paths for pictures at facebook. 2014-03-16 19:08:17 +01:00