YunoHost-Apps/movim_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/movim_ynh.git synced 2024-09-03 19:46:19 +02:00
Code Issues Activity Actions

Merge branch 'master' into dev

Browse source 
Conflicts:
	README.md
	TODO
This commit is contained in:
src386 2015-08-12 12:14:31 +02:00
commit ccb93088ba
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -46,6 +46,10 @@ Username and password are definied during installation.
yunohost app remove movim yunohost app remove movim
**Notes**
* URL rewriting is disabled (experimental feature)
**Help** **Help**
support@conference.yunohost.org src386_ support@conference.yunohost.org src386_

3
TODO
View file

@ -1 +1,4 @@
<<<<<<< HEAD
- Add SSO support - Add SSO support
=======
>>>>>>> master