☰

Merge branch 'master' of https://git.dn42.us/dn42/wiki

florianb committed 2016-05-16 15:10:07 +0200 commit 34039b90470020f8a344b1780c0b82c043964445

				services/Shell.md
			
          @@ -4,4 +4,5 @@ Providers:

           | Person        | Hostname          | Net        | Description |

           |:------------- |:----------------- |:---------- |:----------- |

          +| aix           | entropy.aix.ovh   | everything | irc:aix     |

           | mortzu        | shell.mortzu.dn42 | dn42 only  | -           |

...	...	@@ -4,4 +4,5 @@ Providers:
4	4
5	5	\| Person \| Hostname \| Net \| Description \|
6	6	\|:------------- \|:----------------- \|:---------- \|:----------- \|
	7	+\| aix \| entropy.aix.ovh \| everything \| irc:aix \|
7	8	\| mortzu \| shell.mortzu.dn42 \| dn42 only \| - \|