Commit graph

4 commits

Author SHA1 Message Date
59d127e089 Merged with helma/master 2013-04-07 17:27:18 +02:00
ff7bba76cf Merge remote-tracking branch 'helma/master'
Conflicts:
	.gitignore
	apps
	modules
2013-04-07 17:18:29 +02:00
Simon Oberhammer
4c6e405e06 adding .gitignore
ignore everything created by `ant jar`
2012-03-27 14:23:07 +02:00
964fcc1e54 Added .gitignore file and debian directory 2012-03-22 18:21:29 +01:00