Laurent Eschenauer ac31880d0e Merge branch 'notifier-fe' of git://github.com/Philmod/ardrone-webflight into Philmod-notifier-fe ...

Conflicts:
	.gitignore

2013-05-31 22:03:57 +02:00

..

index.ejs

Merge branch 'notifier-fe' of git://github.com/Philmod/ardrone-webflight into Philmod-notifier-fe

2013-05-31 22:03:57 +02:00