Merge github.com:tobiasd/friendika
This commit is contained in:
		| @@ -4,7 +4,7 @@ | |||||||
|  * Description: Plugin to add contact information to the about page (/friendika) |  * Description: Plugin to add contact information to the about page (/friendika) | ||||||
|  * Version: 1.0 |  * Version: 1.0 | ||||||
|  * Author: Tobias Diekershoff <https://diekershoff.homeunix.net/friendika/profile/tobias> |  * Author: Tobias Diekershoff <https://diekershoff.homeunix.net/friendika/profile/tobias> | ||||||
|  * License: 3-clause BSD license (same as Friendika) |  * License: 3-clause BSD license | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| function impressum_install() { | function impressum_install() { | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|  *   Author: Tobias Diekershoff |  *   Author: Tobias Diekershoff | ||||||
|  *           tobias.diekershoff@gmx.net |  *           tobias.diekershoff@gmx.net | ||||||
|  * |  * | ||||||
|  *   License: 3-clause BSD license (same as Friendika) | *   License: 3-clause BSD license | ||||||
|  * |  * | ||||||
|  *   Configuration: |  *   Configuration: | ||||||
|  *     Add the following two lines to your .htconfig.php file: |  *     Add the following two lines to your .htconfig.php file: | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ | |||||||
|  *   Author: Tobias Diekershoff |  *   Author: Tobias Diekershoff | ||||||
|  *           tobias.diekershoff@gmx.net |  *           tobias.diekershoff@gmx.net | ||||||
|  * |  * | ||||||
|  *   License:3-clause BSD license (same as Friendika) |  *   License:3-clause BSD license | ||||||
|  * |  * | ||||||
|  *   Configuration: |  *   Configuration: | ||||||
|  *     To activate the plugin itself add it to the $a->config['system']['addon'] |  *     To activate the plugin itself add it to the $a->config['system']['addon'] | ||||||
|   | |||||||
| @@ -11,7 +11,7 @@ | |||||||
|  *   Author: Tobias Diekershoff |  *   Author: Tobias Diekershoff | ||||||
|  *           tobias.diekershoff@gmx.net |  *           tobias.diekershoff@gmx.net | ||||||
|  * |  * | ||||||
|  *   License:3-clause BSD license (same as Friendika) |  *   License:3-clause BSD license | ||||||
|  * |  * | ||||||
|  *   Configuration: |  *   Configuration: | ||||||
|  *     To use this plugin you need a OAuth Consumer key pair (key & secret) |  *     To use this plugin you need a OAuth Consumer key pair (key & secret) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user